Enable check_untyped_defs mypy option for testing/ too

Author: bluetech

setup.cfg

@@ -63,13 +63,11 @@ formats = sdist.tgz,bdist_wheel
 
 [mypy]
 mypy_path = src
+check_untyped_defs = True
 ignore_missing_imports = True
 no_implicit_optional = True
 show_error_codes = True
 strict_equality = True
 warn_redundant_casts = True
 warn_return_any = True
 warn_unused_configs = True
-
-[mypy-_pytest.*]
-check_untyped_defs = True

src/_pytest/_code/code.py

@@ -15,6 +15,7 @@
 from typing import Generic
 from typing import Iterable
 from typing import List
+from typing import Mapping
 from typing import Optional
 from typing import Pattern
 from typing import Sequence
@@ -739,7 +740,7 @@ def get_exconly(
                 failindent = indentstr
         return lines
 
-    def repr_locals(self, locals: Dict[str, object]) -> Optional["ReprLocals"]:
+    def repr_locals(self, locals: Mapping[str, object]) -> Optional["ReprLocals"]:
         if self.showlocals:
             lines = []
             keys = [loc for loc in locals if loc[0] != "@"]

src/_pytest/logging.py

@@ -96,7 +96,7 @@ class PercentStyleMultiline(logging.PercentStyle):
     formats the message as if each line were logged separately.
     """
 
-    def __init__(self, fmt: str, auto_indent: Union[int, str, bool]) -> None:
+    def __init__(self, fmt: str, auto_indent: Union[int, str, bool, None]) -> None:
         super().__init__(fmt)
         self._auto_indent = self._get_auto_indent(auto_indent)
 
@@ -109,7 +109,7 @@ def _update_message(
         return tmp
 
     @staticmethod
-    def _get_auto_indent(auto_indent_option: Union[int, str, bool]) -> int:
+    def _get_auto_indent(auto_indent_option: Union[int, str, bool, None]) -> int:
         """Determines the current auto indentation setting
 
         Specify auto indent behavior (on/off/fixed) by passing in
@@ -139,7 +139,9 @@ def _get_auto_indent(auto_indent_option: Union[int, str, bool]) -> int:
             >0 (explicitly set indentation position).
         """
 
-        if type(auto_indent_option) is int:
+        if auto_indent_option is None:
+            return 0
+        elif type(auto_indent_option) is int:
             return int(auto_indent_option)
         elif type(auto_indent_option) is str:
             try:
@@ -781,7 +783,9 @@ class _LiveLoggingStreamHandler(logging.StreamHandler):
     stream = None  # type: TerminalReporter # type: ignore
 
     def __init__(
-        self, terminal_reporter: TerminalReporter, capture_manager: CaptureManager
+        self,
+        terminal_reporter: TerminalReporter,
+        capture_manager: Optional[CaptureManager],
     ) -> None:
         """
         :param _pytest.terminal.TerminalReporter terminal_reporter:

src/_pytest/pytester.py

@@ -400,7 +400,7 @@ def _sys_snapshot():
 
 
 @pytest.fixture
-def _config_for_test():
+def _config_for_test() -> Generator[Config, None, None]:
     from _pytest.config import get_config
 
     config = get_config()

src/_pytest/python_api.py

@@ -710,6 +710,7 @@ def raises(  # noqa: F811
     fail(message)
 
 
+# This doesn't work with mypy for now. Use fail.Exception instead.
 raises.Exception = fail.Exception  # type: ignore