Fixes schemas.py generic code

Author: spacether

modules/openapi-json-schema-generator/src/main/resources/python/schemas.hbs

@@ -2,6 +2,7 @@
 
 {{> _helper_header }}
 
+from __future__ import annotations
 import collections
 import datetime
 import functools
@@ -1871,10 +1872,10 @@ class NoneSchema(
         types = {NoneClass}
 
     @classmethod
-    def from_openapi_data_(cls, arg: None, configuration_: typing.Optional[schema_configuration.SchemaConfiguration] = None) -> TypedSchemas.None.NoneSchema[NoneClass]:
+    def from_openapi_data_(cls, arg: None, configuration_: typing.Optional[schema_configuration.SchemaConfiguration] = None) -> TypedSchemas.None_.NoneSchema[NoneClass]:
         return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, arg_: None, **kwargs: schema_configuration.SchemaConfiguration) -> TypedSchemas.None.NoneSchema[NoneClass]:
+    def __new__(cls, arg_: None, **kwargs: schema_configuration.SchemaConfiguration) -> TypedSchemas.None_.NoneSchema[NoneClass]:
         return super().__new__(cls, arg_, **kwargs)
 
 _NoneSchema = NoneSchema
@@ -2230,7 +2231,7 @@ class DictSchema(
     def from_openapi_data_(cls, arg: typing.Dict[str, typing.Any], configuration_: typing.Optional[schema_configuration.SchemaConfiguration] = None) -> TypedSchemas.Dict.DictSchema[frozendict.frozendict]:
         return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, *args_: typing.Union[dict, frozendict.frozendict], **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, bool, None, bytes, Schema, Unset, ValidationMetadata]) -> -> TypedSchemas.Dict.DictSchema[frozendict.frozendict]:
+    def __new__(cls, *args_: typing.Union[dict, frozendict.frozendict], **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, bool, None, bytes, Schema, Unset, ValidationMetadata]) -> TypedSchemas.Dict.DictSchema[frozendict.frozendict]:
         return super().__new__(cls, *args_, **kwargs)
 
 _DictSchema = DictSchema
@@ -2276,7 +2277,7 @@ class TypedSchemas:
         class AnyTypeSchema(_AnyTypeSchema[T], BoolClass):
             pass
 
-    class None:
+    class None_:
         class NoneSchema(_NoneSchema[T], NoneClass):
             pass
 

samples/openapi3/client/petstore/python/src/petstore_api/schemas.py

@@ -7,6 +7,7 @@
     Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
 """
 
+from __future__ import annotations
 import collections
 import datetime
 import functools
@@ -1782,10 +1783,10 @@ class Schema_:
         types = {NoneClass}
 
     @classmethod
-    def from_openapi_data_(cls, arg: None, configuration_: typing.Optional[schema_configuration.SchemaConfiguration] = None) -> TypedSchemas.None.NoneSchema[NoneClass]:
+    def from_openapi_data_(cls, arg: None, configuration_: typing.Optional[schema_configuration.SchemaConfiguration] = None) -> TypedSchemas.None_.NoneSchema[NoneClass]:
         return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, arg_: None, **kwargs: schema_configuration.SchemaConfiguration) -> TypedSchemas.None.NoneSchema[NoneClass]:
+    def __new__(cls, arg_: None, **kwargs: schema_configuration.SchemaConfiguration) -> TypedSchemas.None_.NoneSchema[NoneClass]:
         return super().__new__(cls, arg_, **kwargs)
 
 _NoneSchema = NoneSchema
@@ -2141,7 +2142,7 @@ class Schema_:
     def from_openapi_data_(cls, arg: typing.Dict[str, typing.Any], configuration_: typing.Optional[schema_configuration.SchemaConfiguration] = None) -> TypedSchemas.Dict.DictSchema[frozendict.frozendict]:
         return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, *args_: typing.Union[dict, frozendict.frozendict], **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, bool, None, bytes, Schema, Unset, ValidationMetadata]) -> -> TypedSchemas.Dict.DictSchema[frozendict.frozendict]:
+    def __new__(cls, *args_: typing.Union[dict, frozendict.frozendict], **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, bool, None, bytes, Schema, Unset, ValidationMetadata]) -> TypedSchemas.Dict.DictSchema[frozendict.frozendict]:
         return super().__new__(cls, *args_, **kwargs)
 
 _DictSchema = DictSchema
@@ -2187,7 +2188,7 @@ class BoolSchema(_BoolSchema[T], BoolClass):
         class AnyTypeSchema(_AnyTypeSchema[T], BoolClass):
             pass
 
-    class None:
+    class None_:
         class NoneSchema(_NoneSchema[T], NoneClass):
             pass