Convert type comments to annotations using com2ann

Author: AlexWaygood

misc/analyze_cache.py

@@ -86,7 +86,7 @@ def report_most_common(chunks: List[JsonDict], amount: Optional[int] = None) ->
 
 
 def compress(chunk: JsonDict) -> JsonDict:
-    cache = {}  # type: Dict[int, JsonDict]
+    cache: Dict[int, JsonDict] = {}
     counter = 0
 
     def helper(chunk: Any) -> Any:
@@ -119,7 +119,7 @@ def helper(chunk: Any) -> Any:
 
 
 def decompress(chunk: JsonDict) -> JsonDict:
-    cache = {}  # type: Dict[int, JsonDict]
+    cache: Dict[int, JsonDict] = {}
 
     def helper(chunk: Any) -> Any:
         if not isinstance(chunk, dict):

misc/incremental_checker.py

@@ -136,7 +136,7 @@ def run_mypy(
 
     If `daemon` is True, we use daemon mode; the daemon must be started and stopped by the caller.
     """
-    stats = {}  # type: Dict[str, Any]
+    stats: Dict[str, Any] = {}
     if daemon:
         command = DAEMON_CMD + ["check", "-v"]
     else:
@@ -163,7 +163,7 @@ def run_mypy(
 
 
 def filter_daemon_stats(output: str) -> Tuple[str, Dict[str, Any]]:
-    stats = {}  # type: Dict[str, Any]
+    stats: Dict[str, Any] = {}
     lines = output.splitlines()
     output_lines = []
     for line in lines:
@@ -258,16 +258,16 @@ def test_incremental(
     """
     print("Note: first commit is evaluated twice to warm up cache")
     commits = [commits[0]] + commits
-    overall_stats = {}  # type: Dict[str, float]
+    overall_stats: Dict[str, float] = {}
     for commit_id, message in commits:
         print(f'Now testing commit {commit_id}: "{message}"')
         execute(["git", "-C", temp_repo_path, "checkout", commit_id])
         runtime, output, stats = run_mypy(
             target_file_path, mypy_cache_path, mypy_script, incremental=True, daemon=daemon
         )
         relevant_stats = combine_stats(overall_stats, stats)
-        expected_runtime = cache[commit_id]["runtime"]  # type: float
-        expected_output = cache[commit_id]["output"]  # type: str
+        expected_runtime: float = cache[commit_id]["runtime"]
+        expected_output: str = cache[commit_id]["output"]
         if output != expected_output:
             print("    Output does not match expected result!")
             print(f"    Expected output ({expected_runtime:.3f} sec):")
@@ -289,7 +289,7 @@ def test_incremental(
 def combine_stats(overall_stats: Dict[str, float], new_stats: Dict[str, Any]) -> Dict[str, float]:
     INTERESTING_KEYS = ["build_time", "gc_time"]
     # For now, we only support float keys
-    relevant_stats = {}  # type: Dict[str, float]
+    relevant_stats: Dict[str, float] = {}
     for key in INTERESTING_KEYS:
         if key in new_stats:
             value = float(new_stats[key])
@@ -391,9 +391,9 @@ def test_repo(
 
 
 def main() -> None:
-    help_factory = lambda prog: RawDescriptionHelpFormatter(
+    help_factory: Any = lambda prog: RawDescriptionHelpFormatter(
         prog=prog, max_help_position=32
-    )  # type: Any
+    )
     parser = ArgumentParser(
         prog="incremental_checker", description=__doc__, formatter_class=help_factory
     )

misc/test_case_to_actual.py

@@ -10,7 +10,7 @@ class Chunk:
     def __init__(self, header_type: str, args: str) -> None:
         self.header_type = header_type
         self.args = args
-        self.lines = []  # type: List[str]
+        self.lines: List[str] = []
 
 
 def is_header(line: str) -> bool:
@@ -22,7 +22,7 @@ def normalize(lines: Iterator[str]) -> Iterator[str]:
 
 
 def produce_chunks(lines: Iterator[str]) -> Iterator[Chunk]:
-    current_chunk = None  # type: Chunk
+    current_chunk: Chunk = None
     for line in normalize(lines):
         if is_header(line):
             if current_chunk is not None:

misc/touch_checker.py

@@ -64,7 +64,7 @@ def teardown() -> None:
 
 
 def make_change_wrappers(filename: str) -> Tuple[Command, Command]:
-    copy = None  # type: Optional[str]
+    copy: Optional[str] = None
 
     def setup() -> None:
         nonlocal copy

mypy/modulefinder.py

@@ -134,8 +134,8 @@ class BuildSourceSet:
 
     def __init__(self, sources: List[BuildSource]) -> None:
         self.source_text_present = False
-        self.source_modules = {}  # type: Dict[str, str]
-        self.source_paths = set()  # type: Set[str]
+        self.source_modules: Dict[str, str] = {}
+        self.source_paths: Set[str] = set()
 
         for source in sources:
             if source.text is not None:

mypy/test/teststubgen.py

@@ -887,8 +887,8 @@ def test(self, arg0: str) -> None:
                 """
                 pass
 
-        output = []  # type: List[str]
-        imports = []  # type: List[str]
+        output: List[str] = []
+        imports: List[str] = []
         mod = ModuleType(TestClass.__module__, "")
         generate_c_function_stub(
             mod, "test", TestClass.test, output, imports, self_var="self", class_name="TestClass"
@@ -902,8 +902,8 @@ class TestClass:
             def test(cls, arg0: str) -> None:
                 pass
 
-        output = []  # type: List[str]
-        imports = []  # type: List[str]
+        output: List[str] = []
+        imports: List[str] = []
         mod = ModuleType(TestClass.__module__, "")
         generate_c_function_stub(
             mod, "test", TestClass.test, output, imports, self_var="cls", class_name="TestClass"