Add from __future__ import annotations in even more files; remove more quotes from annotations

conftest.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os.path
 
 pytest_plugins = ["mypy.test.data"]

docs/source/conf.py

@@ -12,6 +12,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
+from __future__ import annotations
+
 import os
 import sys
 

misc/actions_stubs.py

@@ -1,4 +1,7 @@
 #!/usr/bin/env python3
+
+from __future__ import annotations
+
 import os
 import shutil
 from typing import Any, Tuple

misc/analyze_cache.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 
+from __future__ import annotations
+
 import json
 import os
 import os.path

misc/apply-cache-diff.py

@@ -5,6 +5,8 @@
 many cases instead of full cache artifacts.
 """
 
+from __future__ import annotations
+
 import argparse
 import json
 import os

misc/async_matrix.py

@@ -5,6 +5,8 @@
 testFullCoroutineMatrix in test-data/unit/check-async-await.test.
 """
 
+from __future__ import annotations
+
 import sys
 from types import coroutine
 from typing import Any, Awaitable, Generator, Iterator
@@ -35,7 +37,7 @@ async def decorated_coroutine() -> int:
 class It(Iterator[str]):
     stop = False
 
-    def __iter__(self) -> "It":
+    def __iter__(self) -> It:
         return self
 
     def __next__(self) -> str:

misc/cherry-pick-typeshed.py

@@ -5,6 +5,8 @@
   python3 misc/cherry-pick-typeshed.py --typeshed-dir dir hash
 """
 
+from __future__ import annotations
+
 import argparse
 import os.path
 import re

misc/convert-cache.py

@@ -5,6 +5,8 @@
 See mypy/metastore.py for details.
 """
 
+from __future__ import annotations
+
 import os
 import sys
 

misc/diff-cache.py

@@ -5,6 +5,8 @@
 many cases instead of full cache artifacts.
 """
 
+from __future__ import annotations
+
 import argparse
 import json
 import os

misc/dump-ast.py

@@ -3,6 +3,8 @@
 Parse source files and print the abstract syntax trees.
 """
 
+from __future__ import annotations
+
 import argparse
 import sys
 from typing import Tuple

misc/fix_annotate.py

@@ -27,6 +27,7 @@ def foo(self, bar, baz=12):
 Finally, it knows that __init__() is supposed to return None.
 """
 
+from __future__ import annotations
 
 import os
 import re

misc/incremental_checker.py

@@ -31,6 +31,8 @@
     python3 misc/incremental_checker.py commit 2a432b
 """
 
+from __future__ import annotations
+
 import base64
 import json
 import os

misc/perf_checker.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python3
 
+from __future__ import annotations
+
 import os
 import shutil
 import statistics

misc/proper_plugin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Callable, Optional, Type as typing_Type
 
 from mypy.nodes import TypeInfo

misc/sync-typeshed.py

@@ -7,6 +7,8 @@
 By default, sync to the latest typeshed commit.
 """
 
+from __future__ import annotations
+
 import argparse
 import os
 import shutil

misc/test_case_to_actual.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import os.path
 import sys

misc/touch_checker.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python3
 
+from __future__ import annotations
+
 import glob
 import os
 import shutil

misc/upload-pypi.py

@@ -5,6 +5,8 @@
 
 """
 
+from __future__ import annotations
+
 import argparse
 import contextlib
 import json

misc/variadics.py

@@ -3,6 +3,8 @@
 See https://github.com/python/typing/issues/193#issuecomment-236383893
 """
 
+from __future__ import annotations
+
 LIMIT = 5
 BOUND = "object"
 

mypy/__main__.py

@@ -1,4 +1,7 @@
 """Mypy type checker command line tool."""
+
+from __future__ import annotations
+
 import os
 import sys
 import traceback

mypy/api.py

@@ -43,6 +43,8 @@
 
 """
 
+from __future__ import annotations
+
 import sys
 from io import StringIO
 from typing import Callable, List, TextIO, Tuple

mypy/applytype.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Callable, Dict, Optional, Sequence
 
 import mypy.subtypes

mypy/argmap.py

@@ -1,5 +1,7 @@
 """Utilities for mapping between actual and formal arguments (and their types)."""
 
+from __future__ import annotations
+
 from typing import TYPE_CHECKING, Callable, List, Optional, Sequence, Set
 
 from mypy import nodes
@@ -158,7 +160,7 @@ def f(x: int, *args: str) -> None: ...
     needs a separate instance since instances have per-call state.
     """
 
-    def __init__(self, context: "ArgumentInferContext") -> None:
+    def __init__(self, context: ArgumentInferContext) -> None:
         # Next tuple *args index to use.
         self.tuple_index = 0
         # Keyword arguments in TypedDict **kwargs used.

mypy/binder.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from collections import defaultdict
 from contextlib import contextmanager
 from typing import DefaultDict, Dict, Iterator, List, Optional, Set, Tuple, Union, cast
@@ -234,7 +236,7 @@ def pop_frame(self, can_skip: bool, fall_through: int) -> Frame:
         return result
 
     @contextmanager
-    def accumulate_type_assignments(self) -> "Iterator[Assigns]":
+    def accumulate_type_assignments(self) -> Iterator[Assigns]:
         """Push a new map to collect assigned types in multiassign from union.
 
         If this map is not None, actual binding is deferred until all items in

mypy/bogus_type.py

@@ -10,6 +10,8 @@
 For those cases some other technique should be used.
 """
 
+from __future__ import annotations
+
 from typing import Any, TypeVar
 
 from mypy_extensions import FlexibleAlias

mypy/build.py

@@ -10,6 +10,8 @@
 """
 # TODO: More consistent terminology, e.g. path/fnam, module/id, state/file
 
+from __future__ import annotations
+
 import contextlib
 import errno
 import gc
@@ -132,7 +134,7 @@ class BuildResult:
       errors:  List of error messages.
     """
 
-    def __init__(self, manager: "BuildManager", graph: Graph) -> None:
+    def __init__(self, manager: BuildManager, graph: Graph) -> None:
         self.manager = manager
         self.graph = graph
         self.files = manager.modules
@@ -600,7 +602,7 @@ def __init__(
         search_paths: SearchPaths,
         ignore_prefix: str,
         source_set: BuildSourceSet,
-        reports: "Optional[Reports]",
+        reports: Optional[Reports],
         options: Options,
         version_id: str,
         plugin: Plugin,
@@ -1857,7 +1859,7 @@ class State:
     import_context: List[Tuple[str, int]]
 
     # The State from which this module was imported, if any
-    caller_state: Optional["State"] = None
+    caller_state: Optional[State] = None
 
     # If caller_state is set, the line number in the caller where the import occurred
     caller_line = 0
@@ -1896,9 +1898,9 @@ def __init__(
         path: Optional[str],
         source: Optional[str],
         manager: BuildManager,
-        caller_state: "Optional[State]" = None,
+        caller_state: Optional[State] = None,
         caller_line: int = 0,
-        ancestor_for: "Optional[State]" = None,
+        ancestor_for: Optional[State] = None,
         root_source: bool = False,
         # If `temporary` is True, this State is being created to just
         # quickly parse/load the tree, without an intention to further
@@ -2545,9 +2547,9 @@ def find_module_and_diagnose(
     manager: BuildManager,
     id: str,
     options: Options,
-    caller_state: "Optional[State]" = None,
+    caller_state: Optional[State] = None,
     caller_line: int = 0,
-    ancestor_for: "Optional[State]" = None,
+    ancestor_for: Optional[State] = None,
     root_source: bool = False,
     skip_diagnose: bool = False,
 ) -> Tuple[str, str]:
@@ -2765,7 +2767,7 @@ def skipping_module(
     manager.errors.set_import_context(save_import_context)
 
 
-def skipping_ancestor(manager: BuildManager, id: str, path: str, ancestor_for: "State") -> None:
+def skipping_ancestor(manager: BuildManager, id: str, path: str, ancestor_for: State) -> None:
     """Produce an error for an ancestor ignored due to --follow_imports=error"""
     # TODO: Read the path (the __init__.py file) and return
     # immediately if it's empty or only contains comments.

mypy/checker.py

@@ -1,5 +1,7 @@
 """Mypy type checker."""
 
+from __future__ import annotations
+
 import fnmatch
 import itertools
 from collections import defaultdict
@@ -301,7 +303,7 @@ class TypeChecker(NodeVisitor[None], CheckerPluginInterface):
     pattern_checker: PatternChecker
 
     tscope: Scope
-    scope: "CheckerScope"
+    scope: CheckerScope
     # Stack of function return types
     return_types: List[Type]
     # Flags; true for dynamically typed functions
@@ -5955,7 +5957,7 @@ def iterable_item_type(self, instance: Instance) -> Type:
     def function_type(self, func: FuncBase) -> FunctionLike:
         return function_type(func, self.named_type("builtins.function"))
 
-    def push_type_map(self, type_map: "TypeMap") -> None:
+    def push_type_map(self, type_map: TypeMap) -> None:
         if type_map is None:
             self.binder.unreachable()
         else:

mypy/checkexpr.py

@@ -1,5 +1,7 @@
 """Expression type checker. This file is conceptually part of TypeChecker."""
 
+from __future__ import annotations
+
 import itertools
 from contextlib import contextmanager
 from typing import (
@@ -252,7 +254,7 @@ class ExpressionChecker(ExpressionVisitor[Type]):
     """
 
     # Some services are provided by a TypeChecker instance.
-    chk: "mypy.checker.TypeChecker"
+    chk: mypy.checker.TypeChecker
     # This is shared with TypeChecker, but stored also here for convenience.
     msg: MessageBuilder
     # Type context for type inference
@@ -264,9 +266,7 @@ class ExpressionChecker(ExpressionVisitor[Type]):
     strfrm_checker: StringFormatterChecker
     plugin: Plugin
 
-    def __init__(
-        self, chk: "mypy.checker.TypeChecker", msg: MessageBuilder, plugin: Plugin
-    ) -> None:
+    def __init__(self, chk: mypy.checker.TypeChecker, msg: MessageBuilder, plugin: Plugin) -> None:
         """Construct an expression type checker."""
         self.chk = chk
         self.msg = msg
@@ -653,7 +653,7 @@ def check_typeddict_call(
         self.chk.fail(message_registry.INVALID_TYPEDDICT_ARGS, context)
         return AnyType(TypeOfAny.from_error)
 
-    def validate_typeddict_kwargs(self, kwargs: DictExpr) -> "Optional[Dict[str, Expression]]":
+    def validate_typeddict_kwargs(self, kwargs: DictExpr) -> Optional[Dict[str, Expression]]:
         item_args = [item[1] for item in kwargs.items]
 
         item_names = []  # List[str]

mypy/checkmember.py

@@ -1,5 +1,7 @@
 """Type checking of attribute access"""
 
+from __future__ import annotations
+
 from typing import TYPE_CHECKING, Callable, Optional, Sequence, Union, cast
 
 from mypy import meet, message_registry, subtypes
@@ -85,7 +87,7 @@ def __init__(
         original_type: Type,
         context: Context,
         msg: MessageBuilder,
-        chk: "mypy.checker.TypeChecker",
+        chk: mypy.checker.TypeChecker,
         self_type: Optional[Type],
         module_symbol_table: Optional[SymbolTable] = None,
     ) -> None:
@@ -111,7 +113,7 @@ def copy_modified(
         messages: Optional[MessageBuilder] = None,
         self_type: Optional[Type] = None,
         is_lvalue: Optional[bool] = None,
-    ) -> "MemberContext":
+    ) -> MemberContext:
         mx = MemberContext(
             self.is_lvalue,
             self.is_super,
@@ -142,7 +144,7 @@ def analyze_member_access(
     msg: MessageBuilder,
     *,
     original_type: Type,
-    chk: "mypy.checker.TypeChecker",
+    chk: mypy.checker.TypeChecker,
     override_info: Optional[TypeInfo] = None,
     in_literal_context: bool = False,
     self_type: Optional[Type] = None,