Remove some entries from the mypy whitelist

Author: AA-Turner

pyproject.toml

@@ -230,13 +230,11 @@ module = [
     "tests.test_domains.test_domain_py_fields",
     "tests.test_domains.test_domain_py_pyfunction",
     "tests.test_domains.test_domain_py_pyobject",
-    "tests.test_domains.test_domain_rst",
     "tests.test_domains.test_domain_std",
     # tests/test_environment
     "tests.test_environment.test_environment_toctree",
     # tests/test_ext_autodoc
     "tests.test_ext_autodoc.test_ext_autodoc",
-    "tests.test_ext_autodoc.test_ext_autodoc_events",
     "tests.test_ext_autodoc.test_ext_autodoc_mock",
     # tests/test_ext_autosummary
     "tests.test_ext_autosummary.test_ext_autosummary",
@@ -246,14 +244,9 @@ module = [
     "tests.test_ext_napoleon.test_ext_napoleon_docstring",
     # tests/test_extensions
     "tests.test_extensions.test_ext_apidoc",
-    "tests.test_extensions.test_ext_doctest",
     "tests.test_extensions.test_ext_inheritance_diagram",
-    # tests/test_intl
-    "tests.test_intl.test_intl",
     # tests/test_util
-    "tests.test_util.test_util_i18n",
     "tests.test_util.test_util_inspect",
-    "tests.test_util.test_util_logging",
     "tests.test_util.test_util_nodes",
     "tests.test_util.test_util_typing",
 ]

sphinx/ext/autodoc/_event_listeners.py

@@ -74,7 +74,7 @@ def __call__(
             skip: bool,
             options: Any,
             /,
-        ) -> bool: ...
+        ) -> bool | None: ...
 
 
 def cut_lines(

sphinx/ext/doctest.py

@@ -336,11 +336,11 @@ def __del__(self) -> None:
         if hasattr(self, 'outfile'):
             self.outfile.close()
 
-    def _out(self, text: str) -> None:
+    def _out(self, text: str, /) -> None:
         logger.info(text, nonl=True)
         self.outfile.write(text)
 
-    def _warn_out(self, text: str) -> None:
+    def _warn_out(self, text: str, /) -> None:
         if self.config.verbosity < 0:
             logger.warning(text)
         else:

sphinx/util/i18n.py

@@ -218,7 +218,7 @@ def docname_to_domain(docname: str, compaction: bool | str) -> str:
 
 
 def babel_format_date(
-    date: datetime,
+    date: dt.datetime,
     format: str,
     locale: str,
     formatter: Formatter = babel.dates.format_date,

tests/test_domains/test_domain_rst.py

@@ -225,7 +225,7 @@ def test_rst_directive_option_type(app: SphinxTestApp) -> None:
 
 
 @pytest.mark.sphinx('html', testroot='_blank')
-def test_rst_directive_and_directive_option(app):
+def test_rst_directive_and_directive_option(app: SphinxTestApp) -> None:
     text = '.. rst:directive:: foo\n\n   .. rst:directive:option:: bar\n'
     doctree = restructuredtext.parse(app, text)
     assert_node(

tests/test_ext_autodoc/test_ext_autodoc_events.py

@@ -2,17 +2,32 @@
 
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 import pytest
 
 from sphinx.ext.autodoc import between, cut_lines
 
 from tests.test_ext_autodoc.autodoc_util import FakeEvents, do_autodoc
 
+if TYPE_CHECKING:
+    from typing import Any
+
+    from sphinx.application import Sphinx
+    from sphinx.ext.autodoc._property_types import _AutodocObjType
+
 pytestmark = pytest.mark.usefixtures('inject_autodoc_root_into_sys_path')
 
 
 def test_process_docstring() -> None:
-    def on_process_docstring(app, what, name, obj, options, lines):
+    def on_process_docstring(
+        app: Sphinx,
+        what: _AutodocObjType,
+        name: str,
+        obj: Any,
+        options: Any,
+        lines: list[str],
+    ) -> None:
         lines.clear()
         lines.append('my docstring')
 
@@ -31,7 +46,14 @@ def on_process_docstring(app, what, name, obj, options, lines):
 
 
 def test_process_docstring_for_nondatadescriptor() -> None:
-    def on_process_docstring(app, what, name, obj, options, lines):
+    def on_process_docstring(
+        app: Sphinx,
+        what: _AutodocObjType,
+        name: str,
+        obj: Any,
+        options: Any,
+        lines: list[str],
+    ) -> None:
         raise RuntimeError
 
     events = FakeEvents()
@@ -62,7 +84,7 @@ def test_cut_lines() -> None:
     ]
 
 
-def test_cut_lines_no_objtype():
+def test_cut_lines_no_objtype() -> None:
     docstring_lines = [
         'first line',
         '---',
@@ -73,7 +95,7 @@ def test_cut_lines_no_objtype():
     ]
     process = cut_lines(2)
 
-    process(None, 'function', 'func', None, {}, docstring_lines)
+    process(None, 'function', 'func', None, {}, docstring_lines)  # type: ignore[arg-type]
     assert docstring_lines == [
         'second line',
         '---',
@@ -116,7 +138,14 @@ def test_between_exclude() -> None:
 
 
 def test_skip_module_member() -> None:
-    def autodoc_skip_member(app, what, name, obj, skip, options):
+    def autodoc_skip_member(
+        app: Sphinx,
+        what: _AutodocObjType,
+        name: str,
+        obj: Any,
+        skip: bool,
+        options: Any,
+    ) -> bool | None:
         if name == 'Class':
             return True  # Skip "Class" class in __all__
         elif name == 'raises':

tests/test_extensions/test_ext_doctest.py

@@ -11,7 +11,7 @@
 from packaging.specifiers import InvalidSpecifier
 from packaging.version import InvalidVersion
 
-from sphinx.ext.doctest import is_allowed_version
+from sphinx.ext.doctest import DocTestBuilder, is_allowed_version
 
 if TYPE_CHECKING:
     from sphinx.testing.util import SphinxTestApp
@@ -74,12 +74,12 @@ def test_is_allowed_version() -> None:
         is_allowed_version('>3.4', 'Sphinx')
 
 
-def cleanup_call():
+def cleanup_call() -> None:
     global cleanup_called  # NoQA: PLW0603
     cleanup_called += 1
 
 
-recorded_calls: Counter[tuple[str, str, int]] = Counter()
+recorded_calls: Counter[tuple[str, str, bool]] = Counter()
 
 
 @pytest.mark.sphinx('doctest', testroot='ext-doctest-skipif')
@@ -125,16 +125,17 @@ def test_skipif(app: SphinxTestApp) -> None:
     }
 
 
-def record(directive, part, should_skip):
+def record(directive: str, part: str, should_skip: bool) -> str:
     recorded_calls[directive, part, should_skip] += 1
     return f'Recorded {directive} {part} {should_skip}'
 
 
 @pytest.mark.sphinx('doctest', testroot='ext-doctest-with-autodoc')
-def test_reporting_with_autodoc(app, capfd):
+def test_reporting_with_autodoc(app: SphinxTestApp) -> None:
     # Patch builder to get a copy of the output
-    written = []
-    app.builder._warn_out = written.append
+    written: list[str] = []
+    assert isinstance(app.builder, DocTestBuilder)
+    app.builder._warn_out = written.append  # type: ignore[method-assign]
     app.build(force_all=True)
 
     failures = [
@@ -151,36 +152,43 @@ def test_reporting_with_autodoc(app, capfd):
 
 @pytest.mark.sphinx('doctest', testroot='ext-doctest-fail-fast')
 @pytest.mark.parametrize('fail_fast', [False, True, None])
-def test_fail_fast(app, fail_fast, capsys):
+def test_fail_fast(app: SphinxTestApp, fail_fast: bool | None) -> None:
     if fail_fast is not None:
         app.config.doctest_fail_fast = fail_fast
     # Patch builder to get a copy of the output
-    written = []
-    app.builder._out = written.append
+    written: list[str] = []
+    assert isinstance(app.builder, DocTestBuilder)
+    app.builder._out = written.append  # type: ignore[method-assign]
     app.build(force_all=True)
     assert app.statuscode
 
-    written = ''.join(written)
+    written = ''.join(written).split('\n')
     if fail_fast:
-        assert 'Doctest summary (exiting after first failed test)' in written
-        assert '1 failure in tests' in written
+        assert written[10] == 'Doctest summary (exiting after first failed test)'
+        assert written[13] == '    1 failure in tests'
     else:
-        assert 'Doctest summary\n' in written
-        assert '2 failures in tests' in written
+        assert written[10] == 'Doctest summary'
+        assert written[13] == '    2 failures in tests'
 
 
 @pytest.mark.sphinx('doctest', testroot='ext-doctest-with-autodoc')
 @pytest.mark.parametrize(
     ('test_doctest_blocks', 'group_name'),
-    [(None, 'default'), ('CustomGroupName', 'CustomGroupName')],
+    [
+        (None, 'default'),
+        ('CustomGroupName', 'CustomGroupName'),
+    ],
 )
-def test_doctest_block_group_name(app, test_doctest_blocks, group_name, capfd):
+def test_doctest_block_group_name(
+    app: SphinxTestApp, test_doctest_blocks: str | None, group_name: str
+) -> None:
     if test_doctest_blocks is not None:
         app.config.doctest_test_doctest_blocks = test_doctest_blocks
 
     # Patch builder to get a copy of the output
-    written = []
-    app.builder._warn_out = written.append
+    written: list[str] = []
+    assert isinstance(app.builder, DocTestBuilder)
+    app.builder._warn_out = written.append  # type: ignore[method-assign]
     app.build(force_all=True)
 
     failures = [