petstore regenerated

Author: spacether

modules/openapi-json-schema-generator/src/main/resources/python/api_client.handlebars

@@ -15,16 +15,17 @@ import re
 import tempfile
 import typing
 import typing_extensions
+from urllib import parse
 import urllib3
 from urllib3 import _collections, fields
-import urllib3.parse as parse
 
 {{#if tornado}}
 import tornado.gen
 {{/if}}
 import frozendict
 
-from {{packageName}} import configuration, exceptions, rest, schemas
+from {{packageName}} import exceptions, rest, schemas
+from {{packageName}} import configuration as configuration_module
 
 
 class RequestField(fields.RequestField):
@@ -882,7 +883,7 @@ class OpenApiResponse(JSONDetector, TypedDictInputVerifier, typing.Generic[T]):
         }
 
     @classmethod
-    def deserialize(cls, response: urllib3.HTTPResponse, configuration: configuration.Configuration) -> T:
+    def deserialize(cls, response: urllib3.HTTPResponse, configuration: configuration_module.Configuration) -> T:
         content_type = response.getheader('content-type')
         deserialized_body = schemas.unset
         streamed = response.supports_chunked_reads()
@@ -946,7 +947,7 @@ class ApiClient:
     Ref: https://openapi-generator.tech
     Do not edit the class manually.
 
-    :param configuration: configuration.Configuration object for this client
+    :param configuration: configuration_module.Configuration object for this client
     :param header_name: a header to pass when making calls to the API.
     :param header_value: a header value to pass when making calls to
         the API.
@@ -960,14 +961,14 @@ class ApiClient:
 
     def __init__(
         self,
-        configuration: typing.Optional[configuration.Configuration] = None,
+        configuration: typing.Optional[configuration_module.Configuration] = None,
         header_name: typing.Optional[str] = None,
         header_value: typing.Optional[str] = None,
         cookie: typing.Optional[str] = None,
         pool_threads: int = 1
     ):
         if configuration is None:
-            configuration = configuration.Configuration()
+            configuration = configuration_module.Configuration()
         self.configuration = configuration
         self.pool_threads = pool_threads
 

modules/openapi-json-schema-generator/src/main/resources/python/model_templates/new.handlebars

@@ -41,7 +41,7 @@ def __new__(
 {{/if}}
 {{/if}}
 {{/each}}
-    _configuration: typing.Optional[schemas.Configuration] = None,
+    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
 {{#with additionalProperties}}
 {{#unless getIsBooleanSchemaFalse}}
 {{#if refClass}}

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

@@ -12,10 +12,11 @@ import types
 import typing
 import uuid
 
-from dateutil.parser import isoparser
+from dateutil import parser
 import frozendict
 
-from {{packageName}} import configuration, exceptions
+from {{packageName}} import exceptions
+from {{packageName}} import configuration as configuration_module
 
 
 class Unset(object):
@@ -72,7 +73,7 @@ class ValidationMetadata(frozendict.frozendict):
     def __new__(
         cls,
         path_to_item: typing.Tuple[typing.Union[str, int], ...],
-        configuration: configuration.Configuration,
+        configuration: configuration_module.Configuration,
         seen_classes: typing.FrozenSet[typing.Type] = frozenset(),
         validated_path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Type]] = frozendict.frozendict()
     ):
@@ -81,8 +82,8 @@ class ValidationMetadata(frozendict.frozendict):
             path_to_item: the path to the current data being instantiated.
                 For {'a': [1]} if the code is handling, 1, then the path is ('args[0]', 'a', 0)
                 This changes from location to location
-            configuration: the configuration.Configuration instance to use
-                This is needed because in configuration.Configuration:
+            configuration: the configuration_module.Configuration instance to use
+                This is needed because in configuration_module.Configuration:
                 - one can disable validation checking
                 This does not change from location to location
             seen_classes: when deserializing data that matches multiple schemas, this is used to store
@@ -113,7 +114,7 @@ class ValidationMetadata(frozendict.frozendict):
         return self['path_to_item']
 
     @property
-    def configuration(self) -> configuration.Configuration:
+    def configuration(self) -> configuration_module.Configuration:
         return self['configuration']
 
     @property
@@ -668,9 +669,8 @@ def __validate_numeric_format(
     return None
 
 
-class CustomIsoparser(isoparser.isoparser):
+class CustomIsoparser(parser.isoparser):
 
-    @isoparser._takes_ascii
     def parse_isodatetime(self, dt_str):
         components, pos = self._parse_isodate(dt_str)
         if len(dt_str) > pos:
@@ -688,7 +688,6 @@ class CustomIsoparser(isoparser.isoparser):
 
         return datetime.datetime(*components)
 
-    @isoparser._takes_ascii
     def parse_isodate(self, datestr):
         components, pos = self._parse_isodate(datestr)
 
@@ -1438,7 +1437,7 @@ class Schema:
             io.BufferedReader,
             bytes
         ],
-        _configuration: typing.Optional[configuration.Configuration] = None
+        _configuration: typing.Optional[configuration_module.Configuration] = None
     ):
         """
         Schema from_openapi_data_oapg
@@ -1449,7 +1448,7 @@ class Schema:
         arg = cast_to_allowed_types(arg, from_server, validated_path_to_schemas, ('args[0]',), path_to_type)
         validation_metadata = ValidationMetadata(
             path_to_item=('args[0]',),
-            configuration=_configuration or configuration.Configuration(),
+            configuration=_configuration or configuration_module.Configuration(),
             validated_path_to_schemas=frozendict.frozendict(validated_path_to_schemas)
         )
         path_to_schemas = cls.__get_new_cls(arg, validation_metadata, path_to_type)
@@ -1479,7 +1478,7 @@ class Schema:
         *_args: typing.Union[
             {{> types_all_incl_schema }}
         ],
-        _configuration: typing.Optional[configuration.Configuration] = None,
+        _configuration: typing.Optional[configuration_module.Configuration] = None,
         **kwargs: typing.Union[
             {{> types_all_incl_schema }}
             Unset
@@ -1491,7 +1490,7 @@ class Schema:
         Args:
             _args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
             kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
-            _configuration: contains the configuration.Configuration that enables json schema validation keywords
+            _configuration: contains the configuration_module.Configuration that enables json schema validation keywords
                 like minItems, minLength etc
 
         Note: double underscores are used here because pycharm thinks that these variables
@@ -1513,7 +1512,7 @@ class Schema:
             __arg, __from_server, __validated_path_to_schemas, ('args[0]',), __path_to_type)
         __validation_metadata = ValidationMetadata(
             path_to_item=('args[0]',),
-            configuration=_configuration or configuration.Configuration(),
+            configuration=_configuration or configuration_module.Configuration(),
             validated_path_to_schemas=frozendict.frozendict(__validated_path_to_schemas)
         )
         __path_to_schemas = cls.__get_new_cls(__arg, __validation_metadata, __path_to_type)
@@ -1528,7 +1527,7 @@ class Schema:
         self,
         *_args: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, bool, None, 'Schema'],
-        _configuration: typing.Optional[configuration.Configuration] = None,
+        _configuration: typing.Optional[configuration_module.Configuration] = None,
         **kwargs: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, bool, None, 'Schema', Unset
         ]
@@ -2175,10 +2174,10 @@ class ListSchema(
         types = {tuple}
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[configuration.Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[configuration_module.Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: configuration.Configuration):
+    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: configuration_module.Configuration):
         return super().__new__(cls, _arg, **kwargs)
 
 
@@ -2191,10 +2190,10 @@ class NoneSchema(
         types = {NoneClass}
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[configuration.Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[configuration_module.Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, _arg: None, **kwargs: configuration.Configuration):
+    def __new__(cls, _arg: None, **kwargs: configuration_module.Configuration):
         return super().__new__(cls, _arg, **kwargs)
 
 
@@ -2211,10 +2210,10 @@ class NumberSchema(
         types = {decimal.Decimal}
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[configuration.Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[configuration_module.Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: configuration.Configuration):
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: configuration_module.Configuration):
         return super().__new__(cls, _arg, **kwargs)
 
 
@@ -2234,10 +2233,10 @@ class IntSchema(IntBase, NumberSchema):
         format = 'int'
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[configuration.Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[configuration_module.Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: configuration.Configuration):
+    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: configuration_module.Configuration):
         return super().__new__(cls, _arg, **kwargs)
 
 
@@ -2265,7 +2264,7 @@ class Float32Schema(
         format = 'float'
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[configuration.Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[configuration_module.Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
@@ -2277,7 +2276,7 @@ class Float64Schema(
         format = 'double'
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[configuration.Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[configuration_module.Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
 
@@ -2296,10 +2295,10 @@ class StrSchema(
         types = {str}
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[configuration.Configuration] = None) -> 'StrSchema':
+    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[configuration_module.Configuration] = None) -> 'StrSchema':
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, _arg: typing.Union[str, datetime.date, datetime.datetime, uuid.UUID], **kwargs: configuration.Configuration):
+    def __new__(cls, _arg: typing.Union[str, datetime.date, datetime.datetime, uuid.UUID], **kwargs: configuration_module.Configuration):
         return super().__new__(cls, _arg, **kwargs)
 
 
@@ -2308,7 +2307,7 @@ class UUIDSchema(UUIDBase, StrSchema):
         types = {str}
         format = 'uuid'
 
-    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: configuration.Configuration):
+    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: configuration_module.Configuration):
         return super().__new__(cls, _arg, **kwargs)
 
 
@@ -2317,7 +2316,7 @@ class DateSchema(DateBase, StrSchema):
         types = {str}
         format = 'date'
 
-    def __new__(cls, _arg: typing.Union[str, datetime.date], **kwargs: configuration.Configuration):
+    def __new__(cls, _arg: typing.Union[str, datetime.date], **kwargs: configuration_module.Configuration):
         return super().__new__(cls, _arg, **kwargs)
 
 
@@ -2326,7 +2325,7 @@ class DateTimeSchema(DateTimeBase, StrSchema):
         types = {str}
         format = 'date-time'
 
-    def __new__(cls, _arg: typing.Union[str, datetime.datetime], **kwargs: configuration.Configuration):
+    def __new__(cls, _arg: typing.Union[str, datetime.datetime], **kwargs: configuration_module.Configuration):
         return super().__new__(cls, _arg, **kwargs)
 
 
@@ -2335,7 +2334,7 @@ class DecimalSchema(DecimalBase, StrSchema):
         types = {str}
         format = 'number'
 
-    def __new__(cls, _arg: str, **kwargs: configuration.Configuration):
+    def __new__(cls, _arg: str, **kwargs: configuration_module.Configuration):
         """
         Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
         which can be simple (str) or complex (dicts or lists with nested values)
@@ -2357,7 +2356,7 @@ class BytesSchema(
     class MetaOapg:
         types = {bytes}
 
-    def __new__(cls, _arg: bytes, **kwargs: configuration.Configuration):
+    def __new__(cls, _arg: bytes, **kwargs: configuration_module.Configuration):
         return super(Schema, cls).__new__(cls, _arg)
 
 
@@ -2384,7 +2383,7 @@ class FileSchema(
     class MetaOapg:
         types = {FileIO}
 
-    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: configuration.Configuration):
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: configuration_module.Configuration):
         return super(Schema, cls).__new__(cls, _arg)
 
 
@@ -2402,7 +2401,7 @@ class BinarySchema(
                 FileSchema,
             ]
 
-    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: configuration.Configuration):
+    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: configuration_module.Configuration):
         return super().__new__(cls, _arg)
 
 
@@ -2415,7 +2414,7 @@ class BoolSchema(
         types = {BoolClass}
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[configuration.Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[configuration_module.Configuration] = None):
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
     def __new__(cls, _arg: bool, **kwargs: ValidationMetadata):
@@ -2455,7 +2454,7 @@ class NotAnyTypeSchema(AnyTypeSchema):
     def __new__(
         cls,
         *_args,
-        _configuration: typing.Optional[configuration.Configuration] = None,
+        _configuration: typing.Optional[configuration_module.Configuration] = None,
     ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
@@ -2473,7 +2472,7 @@ class DictSchema(
         types = {frozendict.frozendict}
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[configuration.Configuration] = None):
+    def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[configuration_module.Configuration] = None):
         return super().from_openapi_data_oapg(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]):