From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sun, 24 Nov 2024 08:40:14 +0000 (+0100)
Subject: [3.13] gh-109413: Enable mypy's `disallow_any_generics` setting when checking `libreg... 
X-Git-Tag: v3.13.1~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=24b86308f9dc65e6f7bdd5aa040bfa96fa56fa4c;p=thirdparty%2FPython%2Fcpython.git

[3.13] gh-109413: Enable mypy's `disallow_any_generics` setting when checking `libregrtest` (GH-127033) (#127034)

gh-109413: Enable mypy's `disallow_any_generics` setting when checking `libregrtest` (GH-127033)
(cherry picked from commit 824afbf548e7128ca57c6faf45cfd6b066a6ee45)

Co-authored-by: sobolevn <mail@sobolevn.me>
---

diff --git a/Lib/test/libregrtest/mypy.ini b/Lib/test/libregrtest/mypy.ini
index 905341cc04b8..3fa9afcb7a4a 100644
--- a/Lib/test/libregrtest/mypy.ini
+++ b/Lib/test/libregrtest/mypy.ini
@@ -15,7 +15,6 @@ strict = True
 
 # Various stricter settings that we can't yet enable
 # Try to enable these in the following order:
-disallow_any_generics = False
 disallow_incomplete_defs = False
 disallow_untyped_calls = False
 disallow_untyped_defs = False
diff --git a/Lib/test/libregrtest/results.py b/Lib/test/libregrtest/results.py
index 0e28435bc7d6..53758bf56946 100644
--- a/Lib/test/libregrtest/results.py
+++ b/Lib/test/libregrtest/results.py
@@ -1,5 +1,6 @@
 import sys
 import trace
+from typing import TYPE_CHECKING
 
 from .runtests import RunTests
 from .result import State, TestResult, TestStats, Location
@@ -7,6 +8,9 @@ from .utils import (
     StrPath, TestName, TestTuple, TestList, FilterDict,
     printlist, count, format_duration)
 
+if TYPE_CHECKING:
+    from xml.etree.ElementTree import Element
+
 
 # Python uses exit code 1 when an exception is not caught
 # argparse.ArgumentParser.error() uses exit code 2
@@ -34,7 +38,7 @@ class TestResults:
         self.test_times: list[tuple[float, TestName]] = []
         self.stats = TestStats()
         # used by --junit-xml
-        self.testsuite_xml: list = []
+        self.testsuite_xml: list['Element'] = []
         # used by -T with -j
         self.covered_lines: set[Location] = set()
 
diff --git a/Lib/test/libregrtest/runtests.py b/Lib/test/libregrtest/runtests.py
index 8e9779524c56..3279c1f1aadb 100644
--- a/Lib/test/libregrtest/runtests.py
+++ b/Lib/test/libregrtest/runtests.py
@@ -28,7 +28,7 @@ class JsonFile:
     file: int | None
     file_type: str
 
-    def configure_subprocess(self, popen_kwargs: dict) -> None:
+    def configure_subprocess(self, popen_kwargs: dict[str, Any]) -> None:
         match self.file_type:
             case JsonFileType.UNIX_FD:
                 # Unix file descriptor
diff --git a/Lib/test/libregrtest/worker.py b/Lib/test/libregrtest/worker.py
index f8b8e45eca32..7c801a3cbc15 100644
--- a/Lib/test/libregrtest/worker.py
+++ b/Lib/test/libregrtest/worker.py
@@ -17,7 +17,7 @@ USE_PROCESS_GROUP = (hasattr(os, "setsid") and hasattr(os, "killpg"))
 
 
 def create_worker_process(runtests: WorkerRunTests, output_fd: int,
-                          tmp_dir: StrPath | None = None) -> subprocess.Popen:
+                          tmp_dir: StrPath | None = None) -> subprocess.Popen[str]:
     worker_json = runtests.as_json()
 
     cmd = runtests.create_python_cmd()