Repository navigation
Commit 683a3ee
committed
Clean up git.objects.submodule.base imports
This reorders them lexicographically within each group, makes
spacing/formatting more consistent, and removes the old comment
about needing a dict to set .name, which had originally been on
what later became the BytesIO import but had become separate from
it. (In Python 2, there was a cStringIO type, which could provide a
speed advantage over StringIO, but its instances, not having
instance dictionaries, didn't support the dynamic creation of new
attributes. This was changed to StringIO in 00ce31a to allow .name
to be added. It was changed to BytesIO in bc8c912 to work with
bytes on both Python 2 and Python 3. The comment about needing a
dict later ended up on the preceding line in 0210e39, at which
point its meaning was unclear. Because Python 2 is no longer
supported and Python 3 has no cStringIO type, the comment is no
longer needed, and this commit removes it.)1 parent 5039df3 commit 683a3ee
3 files changed
Lines changed: 11 additions & 17 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,43 +1,37 @@ | |||
| 1 | - # need a dict to set bloody .name field | ||
| 2 | 1 | from io import BytesIO | |
| 3 | 2 | import logging | |
| 4 | 3 | import os | |
| 4 | + import os.path as osp | ||
| 5 | 5 | import stat | |
| 6 | 6 | import uuid | |
| 7 | 7 | ||
| 8 | 8 | import git | |
| 9 | 9 | from git.cmd import Git | |
| 10 | - from git.compat import ( | ||
| 11 | - defenc, | ||
| 12 | - is_win, | ||
| 13 | - ) | ||
| 14 | - from git.config import SectionConstraint, GitConfigParser, cp | ||
| 10 | + from git.compat import defenc, is_win | ||
| 11 | + from git.config import GitConfigParser, SectionConstraint, cp | ||
| 15 | 12 | from git.exc import ( | |
| 13 | + BadName, | ||
| 16 | 14 | InvalidGitRepositoryError, | |
| 17 | 15 | NoSuchPathError, | |
| 18 | 16 | RepositoryDirtyError, | |
| 19 | - BadName, | ||
| 20 | 17 | ) | |
| 21 | 18 | from git.objects.base import IndexObject, Object | |
| 22 | 19 | from git.objects.util import TraversableIterableObj | |
| 23 | - | ||
| 24 | 20 | from git.util import ( | |
| 25 | - join_path_native, | ||
| 26 | - to_native_path_linux, | ||
| 21 | + IterableList, | ||
| 27 | 22 | RemoteProgress, | |
| 23 | + join_path_native, | ||
| 28 | 24 | rmtree, | |
| 25 | + to_native_path_linux, | ||
| 29 | 26 | unbare_repo, | |
| 30 | - IterableList, | ||
| 31 | 27 | ) | |
| 32 | 28 | ||
| 33 | - import os.path as osp | ||
| 34 | - | ||
| 35 | 29 | from .util import ( | |
| 30 | + SubmoduleConfigParser, | ||
| 31 | + find_first_remote_branch, | ||
| 36 | 32 | mkhead, | |
| 37 | 33 | sm_name, | |
| 38 | 34 | sm_section, | |
| 39 | - SubmoduleConfigParser, | ||
| 40 | - find_first_remote_branch, | ||
| 41 | 35 | ) | |
| 42 | 36 | ||
| 43 | 37 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -22,7 +22,7 @@ def tearDown(self): | |||
| 22 | 22 | gc.collect() | |
| 23 | 23 | ||
| 24 | 24 | # ACTUALLY skipped by git.util.rmtree (in local onerror function), from the last call to it via | |
| 25 | - # git.objects.submodule.base.Submodule.remove (at "handle separate bare repository"), line 1068. | ||
| 25 | + # git.objects.submodule.base.Submodule.remove (at "handle separate bare repository"), line 1062. | ||
| 26 | 26 | # | |
| 27 | 27 | # @skipIf(HIDE_WINDOWS_KNOWN_ERRORS, | |
| 28 | 28 | # "FIXME: helper.wrapper fails with: PermissionError: [WinError 5] Access is denied: " | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -458,7 +458,7 @@ def _do_base_tests(self, rwrepo): | |||
| 458 | 458 | ) | |
| 459 | 459 | ||
| 460 | 460 | # ACTUALLY skipped by git.util.rmtree (in local onerror function), called via | |
| 461 | - # git.objects.submodule.base.Submodule.remove at "method(mp)", line 1017. | ||
| 461 | + # git.objects.submodule.base.Submodule.remove at "method(mp)", line 1011. | ||
| 462 | 462 | # | |
| 463 | 463 | # @skipIf(HIDE_WINDOWS_KNOWN_ERRORS, | |
| 464 | 464 | # "FIXME: fails with: PermissionError: [WinError 32] The process cannot access the file because" | |
0 commit comments