Cleanup import typing

Author: spoorcc

dfetch/project/svn.py

@@ -3,8 +3,7 @@
 import os
 import pathlib
 import re
-from collections import namedtuple
-from typing import Dict, List, Optional, Tuple
+from typing import Dict, List, NamedTuple, Optional, Tuple
 
 from dfetch.log import get_logger
 from dfetch.manifest.version import Version
@@ -20,9 +19,15 @@
 logger = get_logger(__name__)
 
 
-External = namedtuple(
-    "External", ["name", "toplevel", "path", "revision", "url", "branch", "tag", "src"]
-)
+class External(NamedTuple):
+    name: str
+    toplevel: str
+    path: str
+    revision: str
+    url: str
+    branch: str
+    tag: str
+    src: str
 
 
 class SvnRepo(VCS):
@@ -46,7 +51,7 @@ def externals() -> List[External]:
 
         repo_root = SvnRepo._get_info_from_target()["Repository Root"]
 
-        externals = []
+        externals: List[External] = []
         path_pattern = r"([^\s^-]+)\s+-"
         for entry in result.stdout.decode().split(os.linesep * 2):
             match: Optional[re.Match[str]] = None

dfetch/vcs/git.py

@@ -4,19 +4,24 @@
 import re
 import shutil
 import tempfile
-from collections import namedtuple
 from pathlib import PurePath
-from typing import Dict, Generator, List, Optional, Sequence, Tuple
+from typing import Dict, Generator, List, NamedTuple, Optional, Sequence, Tuple
 
 from dfetch.log import get_logger
 from dfetch.util.cmdline import SubprocessCommandError, run_on_cmdline
 from dfetch.util.util import in_directory, safe_rmtree
 
 logger = get_logger(__name__)
 
-Submodule = namedtuple(
-    "Submodule", ["name", "toplevel", "path", "sha", "url", "branch", "tag"]
-)
+
+class Submodule(NamedTuple):
+    name: str
+    toplevel: str
+    path: str
+    sha: str
+    url: str
+    branch: str
+    tag: str
 
 
 def get_git_version() -> Tuple[str, str]:
@@ -95,7 +100,7 @@ def _ls_remote(remote: str) -> Dict[str, str]:
             logger, f"git ls-remote --heads --tags {remote}"
         ).stdout.decode()
 
-        info = {}
+        info: Dict[str, str] = {}
         for line in filter(lambda x: x, result.split("\n")):
             sha, ref = [part.strip() for part in f"{line} ".split("\t", maxsplit=1)]
 
@@ -338,7 +343,7 @@ def submodules() -> List[Submodule]:
             ],
         )
 
-        submodules = []
+        submodules: List[Submodule] = []
         urls: Dict[str, str] = {}
         for line in result.stdout.decode().split("\n"):
             if line: