Merge pull request #7604 from bluetech/typing-disallow-any-generics

typing: set disallow_any_generics

Author: bluetech

setup.cfg

@@ -96,6 +96,7 @@ formats = sdist.tgz,bdist_wheel
 [mypy]
 mypy_path = src
 check_untyped_defs = True
+disallow_any_generics = True
 ignore_missing_imports = True
 no_implicit_optional = True
 show_error_codes = True

src/_pytest/_code/code.py

@@ -613,7 +613,7 @@ def getrepr(
         )
         return fmt.repr_excinfo(self)
 
-    def match(self, regexp: "Union[str, Pattern]") -> "Literal[True]":
+    def match(self, regexp: "Union[str, Pattern[str]]") -> "Literal[True]":
         """Check whether the regular expression `regexp` matches the string
         representation of the exception using :func:`python:re.search`.
 
@@ -678,7 +678,7 @@ def get_source(
         self,
         source: "Source",
         line_index: int = -1,
-        excinfo: Optional[ExceptionInfo] = None,
+        excinfo: Optional[ExceptionInfo[BaseException]] = None,
         short: bool = False,
     ) -> List[str]:
         """Return formatted and marked up source lines."""
@@ -703,7 +703,10 @@ def get_source(
         return lines
 
     def get_exconly(
-        self, excinfo: ExceptionInfo, indent: int = 4, markall: bool = False
+        self,
+        excinfo: ExceptionInfo[BaseException],
+        indent: int = 4,
+        markall: bool = False,
     ) -> List[str]:
         lines = []
         indentstr = " " * indent
@@ -743,7 +746,9 @@ def repr_locals(self, locals: Mapping[str, object]) -> Optional["ReprLocals"]:
         return None
 
     def repr_traceback_entry(
-        self, entry: TracebackEntry, excinfo: Optional[ExceptionInfo] = None
+        self,
+        entry: TracebackEntry,
+        excinfo: Optional[ExceptionInfo[BaseException]] = None,
     ) -> "ReprEntry":
         lines = []  # type: List[str]
         style = entry._repr_style if entry._repr_style is not None else self.style
@@ -785,7 +790,7 @@ def _makepath(self, path):
                 path = np
         return path
 
-    def repr_traceback(self, excinfo: ExceptionInfo) -> "ReprTraceback":
+    def repr_traceback(self, excinfo: ExceptionInfo[BaseException]) -> "ReprTraceback":
         traceback = excinfo.traceback
         if self.tbfilter:
             traceback = traceback.filter()
@@ -850,12 +855,14 @@ def _truncate_recursive_traceback(
 
         return traceback, extraline
 
-    def repr_excinfo(self, excinfo: ExceptionInfo) -> "ExceptionChainRepr":
+    def repr_excinfo(
+        self, excinfo: ExceptionInfo[BaseException]
+    ) -> "ExceptionChainRepr":
         repr_chain = (
             []
         )  # type: List[Tuple[ReprTraceback, Optional[ReprFileLocation], Optional[str]]]
-        e = excinfo.value
-        excinfo_ = excinfo  # type: Optional[ExceptionInfo]
+        e = excinfo.value  # type: Optional[BaseException]
+        excinfo_ = excinfo  # type: Optional[ExceptionInfo[BaseException]]
         descr = None
         seen = set()  # type: Set[int]
         while e is not None and id(e) not in seen:

src/_pytest/assertion/rewrite.py

@@ -710,7 +710,7 @@ def run(self, mod: ast.Module) -> None:
             node = nodes.pop()
             for name, field in ast.iter_fields(node):
                 if isinstance(field, list):
-                    new = []  # type: List
+                    new = []  # type: List[ast.AST]
                     for i, child in enumerate(field):
                         if isinstance(child, ast.Assert):
                             # Transform assert.

src/_pytest/cacheprovider.py

@@ -181,7 +181,7 @@ def __init__(self, lfplugin: "LFPlugin") -> None:
         self._collected_at_least_one_failure = False
 
     @pytest.hookimpl(hookwrapper=True)
-    def pytest_make_collect_report(self, collector: nodes.Collector) -> Generator:
+    def pytest_make_collect_report(self, collector: nodes.Collector):
         if isinstance(collector, Session):
             out = yield
             res = out.get_result()  # type: CollectReport

src/_pytest/debugging.py

@@ -3,7 +3,10 @@
 import functools
 import sys
 import types
+from typing import Any
+from typing import Callable
 from typing import Generator
+from typing import List
 from typing import Tuple
 from typing import Union
 
@@ -91,7 +94,7 @@ class pytestPDB:
 
     _pluginmanager = None  # type: PytestPluginManager
     _config = None  # type: Config
-    _saved = []  # type: list
+    _saved = []  # type: List[Tuple[Callable[..., None], PytestPluginManager, Config]]
     _recursive_debug = 0
     _wrapped_pdb_cls = None
 
@@ -274,7 +277,7 @@ def set_trace(cls, *args, **kwargs) -> None:
 
 class PdbInvoke:
     def pytest_exception_interact(
-        self, node: Node, call: "CallInfo", report: BaseReport
+        self, node: Node, call: "CallInfo[Any]", report: BaseReport
     ) -> None:
         capman = node.config.pluginmanager.getplugin("capturemanager")
         if capman:

src/_pytest/fixtures.py

@@ -94,8 +94,8 @@
 
 
 @attr.s(frozen=True)
-class PseudoFixtureDef:
-    cached_result = attr.ib(type="_FixtureCachedResult")
+class PseudoFixtureDef(Generic[_FixtureValue]):
+    cached_result = attr.ib(type="_FixtureCachedResult[_FixtureValue]")
     scope = attr.ib(type="_Scope")
 
 
@@ -141,7 +141,7 @@ def provide(self):
     return decoratescope
 
 
-def get_scope_package(node, fixturedef: "FixtureDef"):
+def get_scope_package(node, fixturedef: "FixtureDef[object]"):
     import pytest
 
     cls = pytest.Package
@@ -397,7 +397,7 @@ class FuncFixtureInfo:
     # definitions.
     initialnames = attr.ib(type=Tuple[str, ...])
     names_closure = attr.ib(type=List[str])
-    name2fixturedefs = attr.ib(type=Dict[str, Sequence["FixtureDef"]])
+    name2fixturedefs = attr.ib(type=Dict[str, Sequence["FixtureDef[Any]"]])
 
     def prune_dependency_tree(self) -> None:
         """Recompute names_closure from initialnames and name2fixturedefs.
@@ -441,7 +441,7 @@ def __init__(self, pyfuncitem) -> None:
         self.fixturename = None  # type: Optional[str]
         #: Scope string, one of "function", "class", "module", "session".
         self.scope = "function"  # type: _Scope
-        self._fixture_defs = {}  # type: Dict[str, FixtureDef]
+        self._fixture_defs = {}  # type: Dict[str, FixtureDef[Any]]
         fixtureinfo = pyfuncitem._fixtureinfo  # type: FuncFixtureInfo
         self._arg2fixturedefs = fixtureinfo.name2fixturedefs.copy()
         self._arg2index = {}  # type: Dict[str, int]
@@ -467,7 +467,7 @@ def node(self):
         """Underlying collection node (depends on current request scope)."""
         return self._getscopeitem(self.scope)
 
-    def _getnextfixturedef(self, argname: str) -> "FixtureDef":
+    def _getnextfixturedef(self, argname: str) -> "FixtureDef[Any]":
         fixturedefs = self._arg2fixturedefs.get(argname, None)
         if fixturedefs is None:
             # We arrive here because of a dynamic call to
@@ -586,7 +586,7 @@ def getfixturevalue(self, argname: str) -> Any:
 
     def _get_active_fixturedef(
         self, argname: str
-    ) -> Union["FixtureDef", PseudoFixtureDef]:
+    ) -> Union["FixtureDef[object]", PseudoFixtureDef[object]]:
         try:
             return self._fixture_defs[argname]
         except KeyError:
@@ -604,9 +604,9 @@ def _get_active_fixturedef(
         self._fixture_defs[argname] = fixturedef
         return fixturedef
 
-    def _get_fixturestack(self) -> List["FixtureDef"]:
+    def _get_fixturestack(self) -> List["FixtureDef[Any]"]:
         current = self
-        values = []  # type: List[FixtureDef]
+        values = []  # type: List[FixtureDef[Any]]
         while 1:
             fixturedef = getattr(current, "_fixturedef", None)
             if fixturedef is None:
@@ -616,7 +616,7 @@ def _get_fixturestack(self) -> List["FixtureDef"]:
             assert isinstance(current, SubRequest)
             current = current._parent_request
 
-    def _compute_fixture_value(self, fixturedef: "FixtureDef") -> None:
+    def _compute_fixture_value(self, fixturedef: "FixtureDef[object]") -> None:
         """Create a SubRequest based on "self" and call the execute method
         of the given FixtureDef object.
 
@@ -689,7 +689,7 @@ def _compute_fixture_value(self, fixturedef: "FixtureDef") -> None:
             self._schedule_finalizers(fixturedef, subrequest)
 
     def _schedule_finalizers(
-        self, fixturedef: "FixtureDef", subrequest: "SubRequest"
+        self, fixturedef: "FixtureDef[object]", subrequest: "SubRequest"
     ) -> None:
         # If fixture function failed it might have registered finalizers.
         self.session._setupstate.addfinalizer(
@@ -751,7 +751,7 @@ def __init__(
         scope: "_Scope",
         param,
         param_index: int,
-        fixturedef: "FixtureDef",
+        fixturedef: "FixtureDef[object]",
     ) -> None:
         self._parent_request = request
         self.fixturename = fixturedef.argname
@@ -773,7 +773,7 @@ def addfinalizer(self, finalizer: Callable[[], object]) -> None:
         self._fixturedef.addfinalizer(finalizer)
 
     def _schedule_finalizers(
-        self, fixturedef: "FixtureDef", subrequest: "SubRequest"
+        self, fixturedef: "FixtureDef[object]", subrequest: "SubRequest"
     ) -> None:
         # If the executing fixturedef was not explicitly requested in the argument list (via
         # getfixturevalue inside the fixture call) then ensure this fixture def will be finished
@@ -1456,8 +1456,8 @@ class FixtureManager:
     def __init__(self, session: "Session") -> None:
         self.session = session
         self.config = session.config  # type: Config
-        self._arg2fixturedefs = {}  # type: Dict[str, List[FixtureDef]]
-        self._holderobjseen = set()  # type: Set
+        self._arg2fixturedefs = {}  # type: Dict[str, List[FixtureDef[Any]]]
+        self._holderobjseen = set()  # type: Set[object]
         self._nodeid_and_autousenames = [
             ("", self.config.getini("usefixtures"))
         ]  # type: List[Tuple[str, List[str]]]
@@ -1534,7 +1534,7 @@ def _getautousenames(self, nodeid: str) -> List[str]:
 
     def getfixtureclosure(
         self, fixturenames: Tuple[str, ...], parentnode, ignore_args: Sequence[str] = ()
-    ) -> Tuple[Tuple[str, ...], List[str], Dict[str, Sequence[FixtureDef]]]:
+    ) -> Tuple[Tuple[str, ...], List[str], Dict[str, Sequence[FixtureDef[Any]]]]:
         # Collect the closure of all fixtures, starting with the given
         # fixturenames as the initial set.  As we have to visit all
         # factory definitions anyway, we also return an arg2fixturedefs
@@ -1557,7 +1557,7 @@ def merge(otherlist: Iterable[str]) -> None:
         # need to return it as well, so save this.
         initialnames = tuple(fixturenames_closure)
 
-        arg2fixturedefs = {}  # type: Dict[str, Sequence[FixtureDef]]
+        arg2fixturedefs = {}  # type: Dict[str, Sequence[FixtureDef[Any]]]
         lastlen = -1
         while lastlen != len(fixturenames_closure):
             lastlen = len(fixturenames_closure)
@@ -1677,7 +1677,7 @@ def parsefactories(
 
     def getfixturedefs(
         self, argname: str, nodeid: str
-    ) -> Optional[Sequence[FixtureDef]]:
+    ) -> Optional[Sequence[FixtureDef[Any]]]:
         """Get a list of fixtures which are applicable to the given node id.
 
         :param str argname: Name of the fixture to search for.
@@ -1691,8 +1691,8 @@ def getfixturedefs(
         return tuple(self._matchfactories(fixturedefs, nodeid))
 
     def _matchfactories(
-        self, fixturedefs: Iterable[FixtureDef], nodeid: str
-    ) -> Iterator[FixtureDef]:
+        self, fixturedefs: Iterable[FixtureDef[Any]], nodeid: str
+    ) -> Iterator[FixtureDef[Any]]:
         from _pytest import nodes
 
         for fixturedef in fixturedefs:

src/_pytest/hookspec.py

@@ -533,7 +533,7 @@ def pytest_report_from_serializable(
 
 @hookspec(firstresult=True)
 def pytest_fixture_setup(
-    fixturedef: "FixtureDef", request: "SubRequest"
+    fixturedef: "FixtureDef[Any]", request: "SubRequest"
 ) -> Optional[object]:
     """Perform fixture setup execution.
 
@@ -549,7 +549,7 @@ def pytest_fixture_setup(
 
 
 def pytest_fixture_post_finalizer(
-    fixturedef: "FixtureDef", request: "SubRequest"
+    fixturedef: "FixtureDef[Any]", request: "SubRequest"
 ) -> None:
     """Called after fixture teardown, but before the cache is cleared, so
     the fixture result ``fixturedef.cached_result`` is still available (not
@@ -826,7 +826,7 @@ def pytest_keyboard_interrupt(
 
 def pytest_exception_interact(
     node: Union["Item", "Collector"],
-    call: "CallInfo[object]",
+    call: "CallInfo[Any]",
     report: Union["CollectReport", "TestReport"],
 ) -> None:
     """Called when an exception was raised which can potentially be

src/_pytest/main.py

@@ -404,7 +404,7 @@ class Failed(Exception):
 
 
 @attr.s
-class _bestrelpath_cache(dict):
+class _bestrelpath_cache(Dict[py.path.local, str]):
     path = attr.ib(type=py.path.local)
 
     def __missing__(self, path: py.path.local) -> str:

src/_pytest/mark/structures.py

@@ -5,6 +5,7 @@
 from typing import Any
 from typing import Callable
 from typing import Iterable
+from typing import Iterator
 from typing import List
 from typing import Mapping
 from typing import NamedTuple
@@ -30,6 +31,8 @@
 if TYPE_CHECKING:
     from typing import Type
 
+    from ..nodes import Node
+
 
 EMPTY_PARAMETERSET_OPTION = "empty_parameter_set_mark"
 
@@ -521,31 +524,32 @@ def __getattr__(self, name: str) -> MarkDecorator:
 MARK_GEN = MarkGenerator()
 
 
-class NodeKeywords(collections.abc.MutableMapping):
-    def __init__(self, node):
+# TODO(py36): inherit from typing.MutableMapping[str, Any].
+class NodeKeywords(collections.abc.MutableMapping):  # type: ignore[type-arg]
+    def __init__(self, node: "Node") -> None:
         self.node = node
         self.parent = node.parent
         self._markers = {node.name: True}
 
-    def __getitem__(self, key):
+    def __getitem__(self, key: str) -> Any:
         try:
             return self._markers[key]
         except KeyError:
             if self.parent is None:
                 raise
             return self.parent.keywords[key]
 
-    def __setitem__(self, key, value):
+    def __setitem__(self, key: str, value: Any) -> None:
         self._markers[key] = value
 
-    def __delitem__(self, key):
+    def __delitem__(self, key: str) -> None:
         raise ValueError("cannot delete key in keywords dict")
 
-    def __iter__(self):
+    def __iter__(self) -> Iterator[str]:
         seen = self._seen()
         return iter(seen)
 
-    def _seen(self):
+    def _seen(self) -> Set[str]:
         seen = set(self._markers)
         if self.parent is not None:
             seen.update(self.parent.keywords)