New schema package

p1c2u · p1c2u · commit d8a36cc998a8 · 2021-05-02T22:07:45.000+01:00
diff --git a/openapi_core/casting/schemas/casters.py b/openapi_core/casting/schemas/casters.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 from openapi_core.casting.schemas.exceptions import CastError
 from openapi_core.types import NoValue
 
diff --git a/openapi_core/deserializing/parameters/deserializers.py b/openapi_core/deserializing/parameters/deserializers.py
@@ -2,7 +2,7 @@
 from openapi_core.deserializing.parameters.exceptions import (
     EmptyParameterValue,
 )
-from openapi_core.spec.parameters import get_aslist, get_explode, get_style
+from openapi_core.schema.parameters import get_aslist, get_explode, get_style
 
 
 class PrimitiveDeserializer(object):
diff --git a/openapi_core/schema/__init__.py b/openapi_core/schema/__init__.py
diff --git a/openapi_core/schema/parameters.py b/openapi_core/schema/parameters.py
diff --git a/openapi_core/schema/schemas.py b/openapi_core/schema/schemas.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 from six import iteritems
 
 
diff --git a/openapi_core/schema/servers.py b/openapi_core/schema/servers.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 from six import iteritems
 
 
diff --git a/openapi_core/schema/specs.py b/openapi_core/schema/specs.py
@@ -1,4 +1,6 @@
-from openapi_core.spec.servers import get_server_url
+from __future__ import division
+
+from openapi_core.schema.servers import get_server_url
 
 
 def get_spec_url(spec, index=0):
diff --git a/openapi_core/spec/paths.py b/openapi_core/spec/paths.py
@@ -8,9 +8,7 @@
 class SpecPath(AccessorPath):
 
     @classmethod
-    def from_spec(
-        cls, spec_dict, dereferencer=None, *args,
-        separator=SPEC_SEPARATOR,
-    ):
+    def from_spec(cls, spec_dict, dereferencer=None, *args, **kwargs):
+        separator = kwargs.pop('separator', SPEC_SEPARATOR)
         accessor = SpecAccessor(spec_dict, dereferencer)
         return cls(accessor, *args, separator=separator)
diff --git a/openapi_core/templating/media_types/finders.py b/openapi_core/templating/media_types/finders.py
@@ -1,4 +1,5 @@
 """OpenAPI core templating media types finders module"""
+from __future__ import division
 import fnmatch
 
 from six import iteritems
diff --git a/openapi_core/templating/paths/finders.py b/openapi_core/templating/paths/finders.py
@@ -1,9 +1,11 @@
 """OpenAPI core templating paths finders module"""
+from __future__ import division
+
 from more_itertools import peekable
 from six import iteritems
 from six.moves.urllib.parse import urljoin, urlparse
 
-from openapi_core.spec.servers import is_absolute
+from openapi_core.schema.servers import is_absolute
 from openapi_core.templating.datatypes import TemplateResult
 from openapi_core.templating.util import parse, search
 from openapi_core.templating.paths.exceptions import (
diff --git a/openapi_core/templating/responses/finders.py b/openapi_core/templating/responses/finders.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 from openapi_core.templating.responses.exceptions import ResponseNotFound
 
 
diff --git a/openapi_core/unmarshalling/schemas/unmarshallers.py b/openapi_core/unmarshalling/schemas/unmarshallers.py
@@ -1,3 +1,4 @@
+from __future__ import division
 from functools import partial
 import logging
 
@@ -12,7 +13,7 @@
 from six import iteritems
 
 from openapi_core.extensions.models.factories import ModelFactory
-from openapi_core.spec.schemas import (
+from openapi_core.schema.schemas import (
     get_all_properties, get_all_properties_names
 )
 from openapi_core.types import NoValue
diff --git a/openapi_core/validation/request/validators.py b/openapi_core/validation/request/validators.py
@@ -1,4 +1,5 @@
 """OpenAPI core validation request validators module"""
+from __future__ import division
 from itertools import chain
 from six import iteritems
 
@@ -8,7 +9,7 @@
     MissingRequiredParameter, MissingParameter, MissingRequestBody,
 )
 from openapi_core.security.exceptions import SecurityError
-from openapi_core.spec.parameters import get_aslist, get_explode
+from openapi_core.schema.parameters import get_aslist, get_explode
 from openapi_core.templating.media_types.exceptions import MediaTypeFinderError
 from openapi_core.templating.paths.exceptions import PathError
 from openapi_core.unmarshalling.schemas.enums import UnmarshalContext
diff --git a/openapi_core/validation/response/validators.py b/openapi_core/validation/response/validators.py
@@ -1,4 +1,6 @@
 """OpenAPI core validation response validators module"""
+from __future__ import division
+
 from openapi_core.casting.schemas.exceptions import CastError
 from openapi_core.deserializing.exceptions import DeserializeError
 from openapi_core.exceptions import MissingResponseContent
diff --git a/openapi_core/validation/validators.py b/openapi_core/validation/validators.py
@@ -1,4 +1,6 @@
 """OpenAPI core validation validators module"""
+from __future__ import division
+
 from openapi_core.unmarshalling.schemas.util import build_format_checker
 
 
diff --git a/tests/integration/schema/test_link_spec.py b/tests/integration/schema/test_link_spec.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 from openapi_core.shortcuts import create_spec
 
 
diff --git a/tests/integration/schema/test_path_params.py b/tests/integration/schema/test_path_params.py
@@ -1,3 +1,5 @@
+from __future__ import division
+
 import pytest
 
 from openapi_core.shortcuts import create_spec
diff --git a/tests/integration/schema/test_spec.py b/tests/integration/schema/test_spec.py
@@ -1,10 +1,11 @@
+from __future__ import division
 import pytest
 from base64 import b64encode
 from six import iteritems, text_type
 
 from openapi_core.shortcuts import create_spec
-from openapi_core.spec.servers import get_server_url
-from openapi_core.spec.specs import get_spec_url
+from openapi_core.schema.servers import get_server_url
+from openapi_core.schema.specs import get_spec_url
 from openapi_core.validation.request.validators import RequestValidator
 from openapi_core.validation.response.validators import ResponseValidator
 
diff --git a/tests/unit/templating/test_paths_finders.py b/tests/unit/templating/test_paths_finders.py
@@ -1,3 +1,4 @@
+from __future__ import division
 import pytest
 
 from openapi_core.spec.paths import SpecPath
diff --git a/tests/unit/templating/test_responses_finders.py b/tests/unit/templating/test_responses_finders.py
@@ -1,3 +1,4 @@
+from __future__ import division
 import mock
 import pytest
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+from __future__ import division`
	`2`	`+`
`1`	`3`	`from openapi_core.casting.schemas.exceptions import CastError`
`2`	`4`	`from openapi_core.types import NoValue`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`from openapi_core.deserializing.parameters.exceptions import (`
`3`	`3`	`EmptyParameterValue,`
`4`	`4`	`)`
`5`		`-from openapi_core.spec.parameters import get_aslist, get_explode, get_style`
	`5`	`+from openapi_core.schema.parameters import get_aslist, get_explode, get_style`
`6`	`6`
`7`	`7`
`8`	`8`	`class PrimitiveDeserializer(object):`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+from __future__ import division`
	`2`	`+`
`1`	`3`	`from six import iteritems`
`2`	`4`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`"""OpenAPI core templating media types finders module"""`
	`2`	`+from __future__ import division`
`2`	`3`	`import fnmatch`
`3`	`4`
`4`	`5`	`from six import iteritems`