Repository navigation
Commit 64c9efd
committed
Restore relative order to fix circular import error
This still uses all explicit rather than wildcard imports (and
still omits suppressions that are no longer needed due to wildcard
imports not being used). But it brings back the old relative order
of the `from ... import ...` statements inside the try-block.
Since this fixes the circular import problem, it is possible to run
the modattrs.py script to check for changes. New changes since
replacing wildcard imports, which are probably undesirable, are the
removal of these attributes pointing to indirect Python submodules
of the git module:
base -> git.index.base
fun -> git.index.fun
head -> git.refs.head
log -> git.refs.log
reference -> git.refs.reference
symbolic -> git.refs.symbolic
tag -> git.refs.tag
typ -> git.index.typ1 parent 7745250 commit 64c9efd
1 file changed
Lines changed: 20 additions & 20 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -119,27 +119,8 @@ | |||
| 119 | 119 | from git.types import PathLike | |
| 120 | 120 | ||
| 121 | 121 | try: | |
| 122 | - from git.cmd import Git # @NoMove | ||
| 123 | 122 | from git.compat import safe_decode # @NoMove | |
| 124 | 123 | from git.config import GitConfigParser # @NoMove | |
| 125 | - from git.db import GitCmdObjectDB, GitDB # @NoMove | ||
| 126 | - from git.diff import ( # @NoMove | ||
| 127 | - INDEX, | ||
| 128 | - NULL_TREE, | ||
| 129 | - Diff, | ||
| 130 | - DiffConstants, | ||
| 131 | - DiffIndex, | ||
| 132 | - Diffable, | ||
| 133 | - ) | ||
| 134 | - from git.index import ( # @NoMove | ||
| 135 | - BaseIndexEntry, | ||
| 136 | - BlobFilter, | ||
| 137 | - CheckoutError, | ||
| 138 | - IndexEntry, | ||
| 139 | - IndexFile, | ||
| 140 | - StageType, | ||
| 141 | - util, # noqa: F401 # For backward compatibility. | ||
| 142 | - ) | ||
| 143 | 124 | from git.objects import ( # @NoMove | |
| 144 | 125 | Blob, | |
| 145 | 126 | Commit, | |
@@ -164,8 +145,27 @@ | |||
| 164 | 145 | Tag, | |
| 165 | 146 | TagReference, | |
| 166 | 147 | ) | |
| 167 | - from git.remote import FetchInfo, PushInfo, Remote, RemoteProgress # @NoMove | ||
| 148 | + from git.diff import ( # @NoMove | ||
| 149 | + INDEX, | ||
| 150 | + NULL_TREE, | ||
| 151 | + Diff, | ||
| 152 | + DiffConstants, | ||
| 153 | + DiffIndex, | ||
| 154 | + Diffable, | ||
| 155 | + ) | ||
| 156 | + from git.db import GitCmdObjectDB, GitDB # @NoMove | ||
| 157 | + from git.cmd import Git # @NoMove | ||
| 168 | 158 | from git.repo import Repo # @NoMove | |
| 159 | + from git.remote import FetchInfo, PushInfo, Remote, RemoteProgress # @NoMove | ||
| 160 | + from git.index import ( # @NoMove | ||
| 161 | + BaseIndexEntry, | ||
| 162 | + BlobFilter, | ||
| 163 | + CheckoutError, | ||
| 164 | + IndexEntry, | ||
| 165 | + IndexFile, | ||
| 166 | + StageType, | ||
| 167 | + util, # noqa: F401 # For backward compatibility. | ||
| 168 | + ) | ||
| 169 | 169 | from git.util import ( # @NoMove | |
| 170 | 170 | Actor, | |
| 171 | 171 | BlockingLockFile, | |
0 commit comments