Fix potentially incorrect ResponseTypeDef name clash resolution

Author: vemel

mypy_boto3_builder/parsers/shape_parser.py

@@ -1030,10 +1030,7 @@ def fix_typed_dict_names(self) -> None:
             if typed_dict is None:
                 continue
 
-            for (
-                old_typed_dict_name,
-                output_typed_dict,
-            ) in self._output_typed_dict_map.iterate_pairs(name):
+            for output_typed_dict in self._output_typed_dict_map.iterate_by_name(name):
                 if typed_dict.is_same(output_typed_dict):
                     continue
 
@@ -1065,13 +1062,11 @@ def fix_typed_dict_names(self) -> None:
             if typed_dict is None:
                 continue
 
-            for (
-                old_typed_dict_name,
-                response_typed_dict,
-            ) in self._response_typed_dict_map.iterate_pairs(name):
+            for response_typed_dict in self._response_typed_dict_map.iterate_by_name(name):
                 if typed_dict.is_same(response_typed_dict):
                     continue
 
+                old_typed_dict_name = response_typed_dict.name
                 new_typed_dict_name = self._get_non_clashing_typed_dict_name(
                     response_typed_dict, "Response"
                 )

mypy_boto3_builder/parsers/typed_dict_map.py

@@ -19,13 +19,14 @@ def add(self, item: TypeTypedDict) -> None:
         """
         self[item.name] = item
 
-    def iterate_pairs(self, name: str) -> Iterator[tuple[str, TypeTypedDict]]:
+    def iterate_by_name(self, name: str) -> Iterator[TypeTypedDict]:
         """
-        Iterate over pairs mathed by real dict name.
+        Iterate over items matched by real dict name.
         """
-        for key, value in list(self.items()):
-            if value.name == name:
-                yield key, value
+        items = list(self.values())
+        for item in items:
+            if item.name == name:
+                yield item
 
     def rename(self, item: TypeTypedDict, new_name: str) -> None:
         """

mypy_boto3_builder/type_annotations/type_union.py

@@ -4,7 +4,7 @@
 
 from collections.abc import Iterable, Iterator
 from pathlib import Path
-from typing import Self
+from typing import Final, Self
 
 from mypy_boto3_builder.enums.service_module_name import ServiceModuleName
 from mypy_boto3_builder.exceptions import TypeAnnotationError
@@ -23,6 +23,8 @@ class TypeUnion(TypeSubscript, TypeDefSortable):
     Wrapper for name Union type annotations, like `MyUnion = Union[str, int]`.
     """
 
+    MIN_CHILDREN: Final[int] = 2
+
     def __init__(
         self,
         children: Iterable[FakeAnnotation],
@@ -32,8 +34,8 @@ def __init__(
         self.name = name
         self.parent = Type.Union
         self.children: list[FakeAnnotation] = list(children)
-        if len(self.children) < 2:
-            raise TypeAnnotationError("Union must have at least 2 children")
+        if len(self.children) < self.MIN_CHILDREN:
+            raise TypeAnnotationError(f"Union must have at least {self.MIN_CHILDREN} children")
         self._stringify = stringify
 
     def is_stringified(self) -> bool:

mypy_boto3_builder/type_maps/method_type_map.py

@@ -115,18 +115,18 @@ def _get_from_service_map(
     )
     class_type_map = service_type_map[service_name]
 
-    for class_name, method_name, argument_name in checks:
-        if class_name not in class_type_map:
+    for check_class_name, check_method_name, check_argument_name in checks:
+        if check_class_name not in class_type_map:
             continue
 
-        method_type_map = class_type_map[class_name]
+        method_type_map = class_type_map[check_class_name]
 
-        if method_name not in method_type_map:
+        if check_method_name not in method_type_map:
             continue
 
-        operation_type_map = method_type_map[method_name]
-        if argument_name in operation_type_map:
-            return operation_type_map[argument_name]
+        operation_type_map = method_type_map[check_method_name]
+        if check_argument_name in operation_type_map:
+            return operation_type_map[check_argument_name]
 
     return None
 

mypy_boto3_builder/utils/pypi_manager.py

@@ -68,7 +68,7 @@ def _get_versions(self) -> set[str]:
             return self._versions
 
         response = requests.get(self.json_url, timeout=REQUEST_TIMEOUT)
-        if response.status_code == 404:
+        if response.status_code == requests.codes.not_found:
             return set()
         if not response.ok:
             raise BuildEnvError(

mypy_boto3_builder/utils/strings.py

@@ -67,8 +67,8 @@ def get_short_docstring(doc: str) -> str:
     result: list[str] = []
     if not doc:
         return ""
-    for line in doc.splitlines():
-        line = line.strip().removesuffix("::")
+    for raw_line in doc.splitlines():
+        line = raw_line.strip().removesuffix("::")
         if not line:
             continue
         if line.startswith(":") or line.lower().startswith("**request syntax**"):
@@ -114,11 +114,12 @@ def textwrap(text: str, width: int) -> str:
     Wrap text to `width` chars.
     """
     result: list[str] = []
-    for line in text.splitlines():
-        if len(line) <= width:
-            result.append(line)
+    for raw_line in text.splitlines():
+        if len(raw_line) <= width:
+            result.append(raw_line)
             continue
 
+        line = raw_line
         while line:
             space_index = line.rfind(" ", 0, width)
             if space_index < 0:

pyproject.toml

@@ -178,6 +178,7 @@ select = [
     "TRY",  # tryceratops
     "PERF", # Perflint
     "FURB", # refurb
+    "PL",   # pylint
 ]
 ignore = [
     "D107",   # undocumented-public-init
@@ -196,6 +197,7 @@ ignore = [
     # "ANN401",  # any-type
     "TRY003",  # raise-vanilla-args
     "PERF203", # try-except-in-loop
+    "PLR0913", # too-many-arguments
 ]
 fixable = ["ALL"]
 unfixable = ["B"]

scripts/integration.py

@@ -327,7 +327,7 @@ def main() -> None:
             error = e
     if error:
         logger.error(error)
-        exit(1)
+        sys.exit(1)
 
 
 if __name__ == "__main__":

uv.lock

@@ -13,9 +13,10 @@ IS_CONDA_FORGE_SUPPORTED  # unused variable (mypy_boto3_builder/package_data.py:
 PYPI_LITE_NAME  # unused variable (mypy_boto3_builder/package_data.py:137)
 IS_CONDA_FORGE_SUPPORTED  # unused variable (mypy_boto3_builder/package_data.py:148)
 PYPI_LITE_NAME  # unused variable (mypy_boto3_builder/package_data.py:175)
-AIOBOTOCORE_NAME  # unused variable (mypy_boto3_builder/package_data.py:179)
-PYPI_LITE_NAME  # unused variable (mypy_boto3_builder/package_data.py:196)
-AIOBOTOCORE_NAME  # unused variable (mypy_boto3_builder/package_data.py:197)
+PYPI_FULL_NAME  # unused variable (mypy_boto3_builder/package_data.py:176)
+AIOBOTOCORE_NAME  # unused variable (mypy_boto3_builder/package_data.py:180)
+PYPI_LITE_NAME  # unused variable (mypy_boto3_builder/package_data.py:197)
+AIOBOTOCORE_NAME  # unused variable (mypy_boto3_builder/package_data.py:198)
 limit_key  # unused variable (mypy_boto3_builder/parsers/shape_parser_types.py:14)
 pagination  # unused variable (mypy_boto3_builder/parsers/shape_parser_types.py:22)
 actions  # unused variable (mypy_boto3_builder/parsers/shape_parser_types.py:104)