Add cast(Repo, mrepo) in try block

Yobmod · Yobmod · commit 35783557c418 · 2021-07-06T14:55:44.000+01:00
diff --git a/git/objects/submodule/base.py b/git/objects/submodule/base.py
@@ -47,15 +47,15 @@
     find_first_remote_branch
 )
 
-from git.repo import Repo
 
 # typing ----------------------------------------------------------------------
-from typing import Callable, Dict, Mapping, Sequence, TYPE_CHECKING
+from typing import Callable, Dict, Mapping, Sequence, TYPE_CHECKING, cast
 from typing import Any, Iterator, Union
 
 from git.types import Commit_ish, PathLike, TBD
 
 if TYPE_CHECKING:
+    from git.repo import Repo
     from git.index import IndexFile
 
 
@@ -589,7 +589,8 @@ def update(self, recursive: bool = False, init: bool = True, to_latest_revision:
                 if not dry_run:
                     # see whether we have a valid branch to checkout
                     try:
-                        assert isinstance(mrepo, Repo)
+                        # assert isinstance(mrepo, Repo)  # cant do this cos of circular import
+                        mrepo = cast('Repo', mrepo)  # Try TypeGuard wirh hasattr?
                         # find  a remote which has our branch - we try to be flexible
                         remote_branch = find_first_remote_branch(mrepo.remotes, self.branch_name)
                         local_branch = mkhead(mrepo, self.branch_path)
