drop support for python3.9

pyupgrade --py310-plus `git ls-files | grep -E "\.py$"`

Author: commonism

aiopenapi3/base.py

@@ -1,20 +1,16 @@
 import typing
 import warnings
-from typing import Optional, Any, ForwardRef, Union, cast
+from typing import Any, ForwardRef, Union, cast
 from collections.abc import Sequence
 
 import re
 import builtins
 import keyword
 import uuid
-import sys
 
 from pathlib import Path
 
-if sys.version_info >= (3, 10):
-    from typing import TypeGuard
-else:
-    from typing_extensions import TypeGuard
+from typing import TypeGuard
 
 from pydantic import RootModel, BaseModel, TypeAdapter, Field, AnyUrl, model_validator, PrivateAttr, ConfigDict
 
@@ -37,7 +33,7 @@ class ObjectBase(BaseModel):
 
 
 class ObjectExtended(ObjectBase):
-    extensions: Optional[Any] = Field(default=None)
+    extensions: Any | None = Field(default=None)
 
     @model_validator(mode="before")
     def validate_ObjectExtended_extensions(cls, values):
@@ -395,9 +391,9 @@ def _get_identity(self, prefix="XLS", name=None):
 
     def set_type(
         self,
-        names: Optional[list[str]] = None,
-        discriminators: Optional[Sequence[DiscriminatorBase]] = None,
-        extra: Optional[list["SchemaBase"]] = None,
+        names: list[str] | None = None,
+        discriminators: Sequence[DiscriminatorBase] | None = None,
+        extra: list["SchemaBase"] | None = None,
     ) -> type[BaseModel]:
         from .model import Model
 
@@ -418,11 +414,11 @@ def set_type(
 
     def get_type(
         self,
-        names: Optional[list[str]] = None,
-        discriminators: Optional[Sequence[DiscriminatorBase]] = None,
-        extra: Optional[list["SchemaBase"]] = None,
+        names: list[str] | None = None,
+        discriminators: Sequence[DiscriminatorBase] | None = None,
+        extra: list["SchemaBase"] | None = None,
         fwdref: bool = False,
-    ) -> Union[type[BaseModel], type[TypeAdapter], ForwardRef]:
+    ) -> type[BaseModel] | type[TypeAdapter] | ForwardRef:
         if fwdref:
             if "module" in ForwardRef.__init__.__code__.co_varnames:
                 # FIXME Python < 3.9 compat
@@ -436,7 +432,7 @@ def get_type(
         else:
             return self.set_type(names, discriminators, extra)
 
-    def model(self, data: "JSON") -> Union[BaseModel, list[BaseModel]]:
+    def model(self, data: "JSON") -> BaseModel | list[BaseModel]:
         """
         Generates a model representing this schema from the given data.
 

aiopenapi3/errors.py

@@ -72,7 +72,7 @@ class OperationIdDuplicationError(SpecError):
     """
 
     operationid: str
-    paths: list[tuple[str, str, object, Optional[list["ServerType"]]]]
+    paths: list[tuple[str, str, object, list["ServerType"] | None]]
 
 
 class ParameterFormatError(SpecError):
@@ -129,7 +129,7 @@ class ContentTypeError(ResponseError):
     """The content-type is unexpected"""
 
     operation: "OperationType"
-    content_type: Optional[str]
+    content_type: str | None
     message: str
     response: httpx.Response
 
@@ -169,7 +169,7 @@ class ResponseSchemaError(ResponseError):
     expectation: "ExpectedType"
     schema: Optional["SchemaType"]
     response: httpx.Response
-    exception: Optional[Exception]
+    exception: Exception | None
 
     def __str__(self):
         return f"""<{self.__class__.__name__} {self.response.request.method} '{self.response.request.url.path}' ({self.operation.operationId})

aiopenapi3/extra/reduce.py

@@ -1,5 +1,5 @@
 import typing
-from typing import Union, Optional
+from typing import Union
 import logging
 import re
 
@@ -24,7 +24,7 @@ class Context:
 
     def __init__(
         self,
-        *operations: list[Union[tuple["PathMatchType", Optional[list["HTTPMethodMatchType"]]], "OperationIdMatchType"]],
+        *operations: list[Union[tuple["PathMatchType", list["HTTPMethodMatchType"] | None], "OperationIdMatchType"]],
     ) -> None:
         """
 

aiopenapi3/json.py

@@ -1,4 +1,3 @@
-from typing import Union
 import urllib.parse
 
 from yarl import URL
@@ -25,7 +24,7 @@ def decode(part: str) -> str:
 
 class JSONReference:
     @staticmethod
-    def split(url: Union[str, URL]) -> tuple[str, str]:
+    def split(url: str | URL) -> tuple[str, str]:
         """
         split the url into path and fragment
         """

aiopenapi3/loader.py

@@ -1,7 +1,6 @@
 import abc
 import logging
 import typing
-from typing import Optional
 import yaml
 import httpx
 import yarl
@@ -119,7 +118,7 @@ def __init__(self, yload: "YAMLLoaderType" = YAML12Loader):
         self.yload = yload
 
     @abc.abstractmethod
-    def load(self, plugins: Plugins, url: yarl.URL, codec: Optional[str] = None):
+    def load(self, plugins: Plugins, url: yarl.URL, codec: str | None = None):
         """
         load and decode description document
 
@@ -131,7 +130,7 @@ def load(self, plugins: Plugins, url: yarl.URL, codec: Optional[str] = None):
         raise NotImplementedError("load")
 
     @classmethod
-    def decode(cls, data: bytes, codec: Optional[str]) -> str:
+    def decode(cls, data: bytes, codec: str | None) -> str:
         """
         decode bytes to ascii or utf-8
 
@@ -203,7 +202,7 @@ class NullLoader(Loader):
     Loader does not load anything
     """
 
-    def load(self, plugins: Plugins, url: yarl.URL, codec: Optional[str] = None):
+    def load(self, plugins: Plugins, url: yarl.URL, codec: str | None = None):
         raise NotImplementedError("load")
 
 
@@ -218,7 +217,7 @@ def __init__(self, baseurl: yarl.URL, session_factory=httpx.Client, yload: "YAML
         self.baseurl: yarl.URL = baseurl
         self.session_factory = session_factory
 
-    def load(self, plugins: Plugins, url: yarl.URL, codec: Optional[str] = None) -> "JSON":
+    def load(self, plugins: Plugins, url: yarl.URL, codec: str | None = None) -> "JSON":
         url = self.baseurl.join(url)
         with self.session_factory() as session:
             data = session.get(str(url))
@@ -246,7 +245,7 @@ def __init__(self, base: Path, yload: "YAMLLoaderType" = YAML12Loader):
         assert isinstance(base, Path)
         self.base = base
 
-    def load(self, plugins: Plugins, url: yarl.URL, codec: Optional[str] = None):
+    def load(self, plugins: Plugins, url: yarl.URL, codec: str | None = None):
         assert isinstance(url, yarl.URL)
         assert plugins
         file = Path(url.path)
@@ -269,7 +268,7 @@ class RedirectLoader(FileSystemLoader):
     everything but the "name" is stripped of the url
     """
 
-    def load(self, plugins: "Plugins", url: yarl.URL, codec: Optional[str] = None):
+    def load(self, plugins: "Plugins", url: yarl.URL, codec: str | None = None):
         return super().load(plugins, yarl.URL(url.name), codec)
 
 
@@ -287,7 +286,7 @@ def __init__(self, *loaders, yload: "YAMLLoaderType" = YAML12Loader):
         Loader.__init__(self, yload)
         self.loaders = loaders
 
-    def load(self, plugins: "Plugins", url: yarl.URL, codec: Optional[str] = None):
+    def load(self, plugins: "Plugins", url: yarl.URL, codec: str | None = None):
         log.debug(f"load {url}")
         errors = []
         for i in self.loaders:

aiopenapi3/log.py

@@ -1,11 +1,11 @@
 import sys
 import logging.config
 import os
-from typing import Any, Optional
+from typing import Any
 
 from pathlib import Path
 
-handlers: Optional[list[str]] = None
+handlers: list[str] | None = None
 
 
 def init(force: bool = False) -> None:

aiopenapi3/model.py

@@ -7,10 +7,7 @@
 from typing import Any, cast, TypeVar
 import typing
 
-if sys.version_info >= (3, 10):
-    from typing import TypeGuard
-else:
-    from typing_extensions import TypeGuard
+from typing import TypeGuard
 
 from typing import Optional, Union, Annotated, Literal
 from pydantic import BaseModel, TypeAdapter, Field, RootModel, ConfigDict
@@ -24,7 +21,7 @@
     from .base import DiscriminatorBase
     from ._types import SchemaType, ReferenceType, PrimitiveTypes, DiscriminatorType
 
-type_format_to_class: dict[str, dict[Optional[str], type]] = collections.defaultdict(dict)
+type_format_to_class: dict[str, dict[str | None, type]] = collections.defaultdict(dict)
 
 log = logging.getLogger("aiopenapi3.model")
 
@@ -135,7 +132,7 @@ def createFields(self, schema: "SchemaType", overwrite=False):
             return
 
         if Model.is_type(schema, "object") or Model.is_type_any(schema):
-            f: Union[SchemaBase, ReferenceBase]
+            f: SchemaBase | ReferenceBase
             assert schema.properties is not None
             for name, f in schema.properties.items():
                 if (
@@ -236,7 +233,7 @@ def _createAnnotations(
             raise ValueError()
         return
 
-    def model(self) -> Union[type[BaseModel], type[None]]:
+    def model(self) -> type[BaseModel] | type[None]:
         if self.root:
             m = self.root
         else:
@@ -253,7 +250,7 @@ def model(self) -> Union[type[BaseModel], type[None]]:
 
     @classmethod
     def collapse(cls, type_name, items: list["_ClassInfo"]) -> type[BaseModel]:
-        r: list[Union[type[BaseModel], type[None]]]
+        r: list[type[BaseModel] | type[None]]
 
         r = [i.model() for i in items]
 
@@ -287,9 +284,9 @@ class Model:  # (BaseModel):
     def from_schema(
         cls,
         schema: "SchemaType",
-        schemanames: Optional[list[str]] = None,
-        discriminators: Optional[list["DiscriminatorType"]] = None,
-        extra: Optional[list["SchemaType"]] = None,
+        schemanames: list[str] | None = None,
+        discriminators: list["DiscriminatorType"] | None = None,
+        extra: list["SchemaType"] | None = None,
     ) -> type[BaseModel]:
         if schemanames is None:
             schemanames = []
@@ -313,7 +310,7 @@ def createClassInfo(
         _type: str,
         schemanames: list[str],
         discriminators: list["DiscriminatorType"],
-        extra: Optional[list["SchemaType"]],
+        extra: list["SchemaType"] | None,
     ) -> _ClassInfo:
         from . import v20, v30, v31
 
@@ -504,7 +501,7 @@ def createConfigDict(schema: "SchemaType"):
 
     @staticmethod
     def createAnnotation(
-        schema: Optional[Union["SchemaType", "ReferenceType"]], _type: Optional[str] = None, fwdref: bool = False
+        schema: Union["SchemaType", "ReferenceType"] | None, _type: str | None = None, fwdref: bool = False
     ) -> type:
         if schema is None:
             return BaseModel
@@ -662,7 +659,7 @@ def is_type(schema: "SchemaType", type_) -> bool:
         return isinstance(schema.type, str) and schema.type == type_ or Model.or_type(schema, type_, l=None)
 
     @staticmethod
-    def or_type(schema: "SchemaType", type_: str, l: Optional[int] = 2) -> bool:
+    def or_type(schema: "SchemaType", type_: str, l: int | None = 2) -> bool:
         return isinstance((t := schema.type), list) and (l is None or len(t) == l) and type_ in t
 
     @staticmethod

aiopenapi3/models/epoch.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
 import datetime
-from typing import Any, Callable
+from typing import Any
+from collections.abc import Callable
 
 import pydantic_core.core_schema
 from pydantic import GetJsonSchemaHandler