misc fixes

Author: eli-bl

end_to_end_tests/functional_tests/generated_code_execution/test_arrays.py

@@ -1,4 +1,4 @@
-from typing import Any, ForwardRef, List, Union
+from typing import Any, ForwardRef, Union
 
 from end_to_end_tests.functional_tests.helpers import (
     assert_model_decode_encode,
@@ -65,9 +65,9 @@ def test_array_of_object(self, ModelWithArrayOfObjects, SimpleObject):
         )
 
     def test_type_hints(self, ModelWithArrayOfAny, ModelWithArrayOfInts, ModelWithArrayOfObjects, Unset):
-        assert_model_property_type_hint(ModelWithArrayOfAny, "array_prop", Union[List[Any], Unset])
-        assert_model_property_type_hint(ModelWithArrayOfInts, "array_prop", Union[List[int], Unset])
-        assert_model_property_type_hint(ModelWithArrayOfObjects, "array_prop", Union[List[ForwardRef("SimpleObject")], Unset])
+        assert_model_property_type_hint(ModelWithArrayOfAny, "array_prop", Union[list[Any], Unset])
+        assert_model_property_type_hint(ModelWithArrayOfInts, "array_prop", Union[list[int], Unset])
+        assert_model_property_type_hint(ModelWithArrayOfObjects, "array_prop", Union[list["SimpleObject"], Unset])
 
 
 @with_generated_client_fixture(
@@ -133,16 +133,16 @@ def test_prefix_items_and_regular_items(self, ModelWithMixedItems, SimpleObject)
         )
 
     def test_type_hints(self, ModelWithSinglePrefixItem, ModelWithPrefixItems, ModelWithMixedItems, Unset):
-        assert_model_property_type_hint(ModelWithSinglePrefixItem, "array_prop", Union[List[str], Unset])
+        assert_model_property_type_hint(ModelWithSinglePrefixItem, "array_prop", Union[list[str], Unset])
         assert_model_property_type_hint(
             ModelWithPrefixItems,
             "array_prop",
-            Union[List[Union[ForwardRef("SimpleObject"), str]], Unset],
+            Union[list[Union[ForwardRef("SimpleObject"), str]], Unset],
         )
         assert_model_property_type_hint(
             ModelWithMixedItems,
             "array_prop",
-            Union[List[Union[ForwardRef("SimpleObject"), str]], Unset],
+            Union[list[Union[ForwardRef("SimpleObject"), str]], Unset],
         )
         # Note, this test is asserting the current behavior which, due to limitations of the implementation
         # (see: https://github.com/openapi-generators/openapi-python-client/pull/1130), is not really doing

end_to_end_tests/functional_tests/generated_code_execution/test_docstrings.py

@@ -1,4 +1,4 @@
-from typing import Any, List
+from typing import Any
 
 from end_to_end_tests.functional_tests.helpers import (
     with_generated_code_import,
@@ -7,12 +7,12 @@
 
 
 class DocstringParser:
-    lines: List[str]
+    lines: list[str]
 
     def __init__(self, item: Any):
         self.lines = [line.lstrip() for line in item.__doc__.split("\n")]
 
-    def get_section(self, header_line: str) -> List[str]:
+    def get_section(self, header_line: str) -> list[str]:
         lines = self.lines[self.lines.index(header_line)+1:]
         return lines[0:lines.index("")]
 

end_to_end_tests/functional_tests/helpers.py

@@ -1,6 +1,6 @@
 from typing import Any, Dict
 import re
-from typing import List, Optional
+from typing import Optional
 
 from click.testing import Result
 import pytest
@@ -12,7 +12,7 @@ def with_generated_client_fixture(
     openapi_spec: str,
     name: str="generated_client",
     config: str="",
-    extra_args: List[str] = [],
+    extra_args: list[str] = [],
 ):
     """Decorator to apply to a test class to create a fixture inside it called 'generated_client'.
     
@@ -79,7 +79,7 @@ def assert_model_property_type_hint(model_class: Any, name: str, expected_type_h
 
 def inline_spec_should_fail(
     openapi_spec: str,
-    extra_args: List[str] = [],
+    extra_args: list[str] = [],
     config: str = "",
     filename_suffix: str = "",
     add_missing_sections = True,
@@ -122,7 +122,7 @@ def __init__(self, generated_client: GeneratedClientContext) -> None:
         assert "Warning(s) encountered while generating" in output
         self.by_schema = {}
         self.output = output
-        bad_schema_regex = "Unable to (parse|process) schema /components/schemas/(\w*)"
+        bad_schema_regex = "Unable to (parse|process) schema /components/schemas/(\\w*)"
         last_name = ""
         while True:
             if not (match := re.search(bad_schema_regex, output)):