[3.13] gh-133117: Enable stricter mypy checks for `tomllib` (GH-133206) (#133343)

gh-133117: Enable stricter mypy checks for `tomllib` (GH-133206)
(cherry picked from commit cb3174113e7dbb8a757ce64faac5a8c7e074945b)

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

diff --git a/Lib/tomllib/_parser.py b/Lib/tomllib/_parser.py
index 86322e2761befc6b33d2a491c4cbe432d8c00f86..9c80a6a547dce9116384dedb59df175613ddd9c7 100644 (file)
--- a/Lib/tomllib/_parser.py
+++ b/Lib/tomllib/_parser.py
@@ -142,7 +142,7 @@ class Flags:
     EXPLICIT_NEST = 1
 
     def __init__(self) -> None:
-        self._flags: dict[str, dict] = {}
+        self._flags: dict[str, dict[Any, Any]] = {}
         self._pending_flags: set[tuple[Key, int]] = set()
 
     def add_pending(self, key: Key, flag: int) -> None:
@@ -200,7 +200,7 @@ class NestedDict:
         key: Key,
         *,
         access_lists: bool = True,
-    ) -> dict:
+    ) -> dict[str, Any]:
         cont: Any = self.dict
         for k in key:
             if k not in cont:
@@ -409,9 +409,9 @@ def parse_one_line_basic_str(src: str, pos: Pos) -> tuple[Pos, str]:
     return parse_basic_str(src, pos, multiline=False)
 
 
-def parse_array(src: str, pos: Pos, parse_float: ParseFloat) -> tuple[Pos, list]:
+def parse_array(src: str, pos: Pos, parse_float: ParseFloat) -> tuple[Pos, list[Any]]:
     pos += 1
-    array: list = []
+    array: list[Any] = []
 
     pos = skip_comments_and_array_ws(src, pos)
     if src.startswith("]", pos):
@@ -433,7 +433,7 @@ def parse_array(src: str, pos: Pos, parse_float: ParseFloat) -> tuple[Pos, list]
             return pos + 1, array
 
 
-def parse_inline_table(src: str, pos: Pos, parse_float: ParseFloat) -> tuple[Pos, dict]:
+def parse_inline_table(src: str, pos: Pos, parse_float: ParseFloat) -> tuple[Pos, dict[str, Any]]:
     pos += 1
     nested_dict = NestedDict()
     flags = Flags()

diff --git a/Lib/tomllib/_re.py b/Lib/tomllib/_re.py
index 994bb7493fd92865e6ab87c277ba5741b44c31a9..a97cab2f9db0b2d61beb8ef6ee294f1b50d766c7 100644 (file)
--- a/Lib/tomllib/_re.py
+++ b/Lib/tomllib/_re.py
@@ -49,7 +49,7 @@ RE_DATETIME = re.compile(
 )
 
 
-def match_to_datetime(match: re.Match) -> datetime | date:
+def match_to_datetime(match: re.Match[str]) -> datetime | date:
     """Convert a `RE_DATETIME` match to `datetime.datetime` or `datetime.date`.
 
     Raises ValueError if the match does not correspond to a valid date
@@ -95,13 +95,13 @@ def cached_tz(hour_str: str, minute_str: str, sign_str: str) -> timezone:
     )
 
 
-def match_to_localtime(match: re.Match) -> time:
+def match_to_localtime(match: re.Match[str]) -> time:
     hour_str, minute_str, sec_str, micros_str = match.groups()
     micros = int(micros_str.ljust(6, "0")) if micros_str else 0
     return time(int(hour_str), int(minute_str), int(sec_str), micros)
 
 
-def match_to_number(match: re.Match, parse_float: ParseFloat) -> Any:
+def match_to_number(match: re.Match[str], parse_float: ParseFloat) -> Any:
     if match.group("floatpart"):
         return parse_float(match.group())
     return int(match.group(), 0)

diff --git a/Lib/tomllib/mypy.ini b/Lib/tomllib/mypy.ini
index 0297d19e2c844569eed20abcc849cfa503002581..1761dce45562a602c6a9a6254a56136354e20f88 100644 (file)
--- a/Lib/tomllib/mypy.ini
+++ b/Lib/tomllib/mypy.ini
@@ -15,5 +15,3 @@ strict = True
 strict_bytes = True
 local_partial_types = True
 warn_unreachable = True
-# TODO(@sobolevn): remove this setting and refactor any found problems
-disallow_any_generics = False 
\ No newline at end of file