Fix for Python 3.9: replace "|" with "Optional[...]"

Author: hathawsh

openapi_pydantic/compat.py

@@ -1,6 +1,6 @@
 """Compatibility layer to make this package usable with Pydantic 1 or 2"""
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Optional
 
 from pydantic.version import VERSION as PYDANTIC_VERSION
 
@@ -30,7 +30,7 @@
 
     def ConfigDict(
         extra: Literal["allow", "ignore", "forbid"] = "allow",
-        json_schema_extra: dict[str, Any] | None = None,
+        json_schema_extra: Optional[dict[str, Any]] = None,
         populate_by_name: bool = True,
     ) -> PydanticConfigDict:
         """Stub for pydantic.ConfigDict in Pydantic 2"""
@@ -53,7 +53,7 @@ def models_json_schema(
         *,
         by_alias: bool = True,
         ref_template: str = "#/$defs/{model}",
-        schema_generator: type | None = None,
+        schema_generator: Optional[type] = None,
     ) -> tuple[dict, dict[str, Any]]:
         """Stub for pydantic.json_schema.models_json_schema in Pydantic 2"""
         ...

openapi_pydantic/v3/v3_0_3/schema.py

@@ -602,9 +602,9 @@ class Config:
     def schema_validate(
         obj: Any,
         *,
-        strict: bool | None = None,
-        from_attributes: bool | None = None,
-        context: dict[str, Any] | None = None
+        strict: Optional[bool] = None,
+        from_attributes: Optional[bool] = None,
+        context: Optional[dict[str, Any]] = None
     ) -> Schema:
         ...
 

openapi_pydantic/v3/v3_0_3/util.py

@@ -1,5 +1,16 @@
 import logging
-from typing import TYPE_CHECKING, Any, Generic, List, Optional, Set, Type, TypeVar, cast
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Generic,
+    List,
+    Optional,
+    Set,
+    Type,
+    TypeVar,
+    Union,
+    cast,
+)
 
 from pydantic import BaseModel
 
@@ -143,7 +154,7 @@ def construct_open_api_with_schema_class(
 
 def _validate_schemas(
     schema_definitions: dict[str, Any]
-) -> dict[str, Reference | Schema]:
+) -> dict[str, Union[Reference, Schema]]:
     """Convert JSON Schema definitions to parsed OpenAPI objects"""
     # Note: if an error occurs in schema_validate(), it may indicate that
     # the generated JSON schemas are not compatible with the version

openapi_pydantic/v3/v3_1_0/schema.py

@@ -959,9 +959,9 @@ class Config:
     def schema_validate(
         obj: Any,
         *,
-        strict: bool | None = None,
-        from_attributes: bool | None = None,
-        context: dict[str, Any] | None = None
+        strict: Optional[bool] = None,
+        from_attributes: Optional[bool] = None,
+        context: Optional[dict[str, Any]] = None
     ) -> Schema:
         ...
 

tests/util/test_optional_and_computed.py

@@ -1,3 +1,5 @@
+from typing import Optional
+
 import pytest
 
 from openapi_pydantic import (
@@ -69,7 +71,7 @@ class ConfigDictExt(ConfigDict, total=False):
 
     class SampleModel(BaseModel):
         req: bool
-        opt: bool | None = None
+        opt: Optional[bool] = None
 
         @computed_field  # type: ignore
         @property

tests/v3_0_3/test_optional_and_computed.py

@@ -1,3 +1,5 @@
+from typing import Optional
+
 import pytest
 
 from openapi_pydantic.compat import PYDANTIC_V2, JsonSchemaMode
@@ -72,7 +74,7 @@ class ConfigDictExt(ConfigDict, total=False):
 
     class SampleModel(BaseModel):
         req: bool
-        opt: bool | None = None
+        opt: Optional[bool] = None
 
         @computed_field  # type: ignore
         @property