Run pre-commit run pyupgrade -a

Author: kurtmckee

openapi_spec_validator/__main__.py

@@ -2,7 +2,7 @@
 import sys
 from argparse import ArgumentParser
 from typing import Optional
-from typing import Sequence
+from collections.abc import Sequence
 
 from jsonschema.exceptions import ValidationError
 from jsonschema.exceptions import best_match

openapi_spec_validator/readers.py

@@ -8,11 +8,11 @@
 from jsonschema_path.typing import Schema
 
 
-def read_from_stdin(filename: str) -> Tuple[Schema, str]:
+def read_from_stdin(filename: str) -> tuple[Schema, str]:
     return file_handler(sys.stdin), ""  # type: ignore
 
 
-def read_from_filename(filename: str) -> Tuple[Schema, str]:
+def read_from_filename(filename: str) -> tuple[Schema, str]:
     if not path.isfile(filename):
         raise OSError(f"No such file: {filename}")
 

openapi_spec_validator/schemas/utils.py

@@ -8,7 +8,7 @@
 from jsonschema_path.typing import Schema
 
 
-def get_schema(version: str) -> Tuple[Schema, str]:
+def get_schema(version: str) -> tuple[Schema, str]:
     schema_path = f"resources/schemas/v{version}/schema.json"
     ref = files("openapi_spec_validator") / schema_path
     with as_file(ref) as resource_path:

openapi_spec_validator/shortcuts.py

@@ -1,6 +1,6 @@
 """OpenAPI spec validator shortcuts module."""
 import warnings
-from typing import Mapping
+from collections.abc import Mapping
 from typing import Optional
 from typing import Type
 
@@ -50,7 +50,7 @@ def validate(
 
 def validate_url(
     spec_url: str,
-    cls: Optional[Type[SpecValidator]] = None,
+    cls: Optional[type[SpecValidator]] = None,
 ) -> None:
     spec = all_urls_handler(spec_url)
     return validate(spec, base_uri=spec_url, cls=cls)
@@ -82,7 +82,7 @@ def validate_spec(
 def validate_spec_url(
     spec_url: str,
     validator: Optional[SupportsValidation] = None,
-    cls: Optional[Type[SpecValidator]] = None,
+    cls: Optional[type[SpecValidator]] = None,
 ) -> None:
     warnings.warn(
         "validate_spec_url shortcut is deprecated. Use validate_url instead.",

openapi_spec_validator/validation/caches.py

@@ -1,6 +1,6 @@
 from typing import Generic
-from typing import Iterable
-from typing import Iterator
+from collections.abc import Iterable
+from collections.abc import Iterator
 from typing import List
 from typing import TypeVar
 
@@ -14,7 +14,7 @@ class CachedIterable(Iterable[T], Generic[T]):
     It should not be iterated by his own.
     """
 
-    cache: List[T]
+    cache: list[T]
     iter: Iterator[T]
     completed: bool
 

openapi_spec_validator/validation/decorators.py

@@ -3,8 +3,8 @@
 from functools import wraps
 from typing import Any
 from typing import Callable
-from typing import Iterable
-from typing import Iterator
+from collections.abc import Iterable
+from collections.abc import Iterator
 from typing import TypeVar
 
 from jsonschema.exceptions import ValidationError

openapi_spec_validator/validation/keywords.py

@@ -1,8 +1,8 @@
 import string
 from typing import TYPE_CHECKING
 from typing import Any
-from typing import Sequence
-from typing import Iterator
+from collections.abc import Sequence
+from collections.abc import Iterator
 from typing import List
 from typing import Optional
 from typing import cast
@@ -68,7 +68,7 @@ class SchemaValidator(KeywordValidator):
     def __init__(self, registry: "KeywordValidatorRegistry"):
         super().__init__(registry)
 
-        self.schema_ids_registry: Optional[List[int]] = []
+        self.schema_ids_registry: Optional[list[int]] = []
 
     @property
     def default_validator(self) -> ValueValidator:
@@ -305,7 +305,7 @@ class OperationValidator(KeywordValidator):
     def __init__(self, registry: "KeywordValidatorRegistry"):
         super().__init__(registry)
 
-        self.operation_ids_registry: Optional[List[str]] = []
+        self.operation_ids_registry: Optional[list[str]] = []
 
     @property
     def responses_validator(self) -> ResponsesValidator:
@@ -356,8 +356,7 @@ def __call__(
         for path in self._get_path_params_from_url(url):
             if path not in all_params:
                 yield UnresolvableParameterError(
-                    "Path parameter '{}' for '{}' operation in '{}' "
-                    "was not resolved".format(path, name, url)
+                    f"Path parameter '{path}' for '{name}' operation in '{url}' was not resolved"
                 )
         return
 

openapi_spec_validator/validation/protocols.py

@@ -1,4 +1,4 @@
-from typing import Iterator
+from collections.abc import Iterator
 from typing import Optional
 from typing import Protocol
 from typing import runtime_checkable

openapi_spec_validator/validation/proxies.py

@@ -2,8 +2,8 @@
 import warnings
 from collections.abc import Hashable
 from typing import Any
-from typing import Iterator
-from typing import Mapping
+from collections.abc import Iterator
+from collections.abc import Mapping
 from typing import Optional
 from typing import Tuple
 
@@ -59,7 +59,7 @@ def iter_errors(
 
 
 class DetectValidatorProxy:
-    def __init__(self, choices: Mapping[Tuple[str, str], SpecValidatorProxy]):
+    def __init__(self, choices: Mapping[tuple[str, str], SpecValidatorProxy]):
         self.choices = choices
 
     def detect(self, instance: Schema) -> SpecValidatorProxy:

openapi_spec_validator/validation/registries.py

@@ -1,15 +1,15 @@
 from __future__ import annotations
 
 from typing import DefaultDict
-from typing import Mapping
+from collections.abc import Mapping
 from typing import Type
 
 from openapi_spec_validator.validation.keywords import KeywordValidator
 
 
 class KeywordValidatorRegistry(DefaultDict[str, KeywordValidator]):
     def __init__(
-        self, keyword_validators: Mapping[str, Type[KeywordValidator]]
+        self, keyword_validators: Mapping[str, type[KeywordValidator]]
     ):
         super().__init__()
         self.keyword_validators = keyword_validators