Skip to content

Commit 0b23d66

Browse files
committed
New schema package
1 parent 0f15095 commit 0b23d66

File tree

20 files changed

+35
-11
lines changed

20 files changed

+35
-11
lines changed

openapi_core/casting/schemas/casters.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from __future__ import division
2+
13
from openapi_core.casting.schemas.exceptions import CastError
24
from openapi_core.types import NoValue
35

openapi_core/deserializing/parameters/deserializers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from openapi_core.deserializing.parameters.exceptions import (
33
EmptyParameterValue,
44
)
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
66

77

88
class PrimitiveDeserializer(object):

openapi_core/schema/__init__.py

Whitespace-only changes.
File renamed without changes.

openapi_core/spec/schemas.py renamed to openapi_core/schema/schemas.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from __future__ import division
2+
13
from six import iteritems
24

35

openapi_core/spec/servers.py renamed to openapi_core/schema/servers.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from __future__ import division
2+
13
from six import iteritems
24

35

openapi_core/spec/specs.py renamed to openapi_core/schema/specs.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
from openapi_core.spec.servers import get_server_url
1+
from __future__ import division
2+
3+
from openapi_core.schema.servers import get_server_url
24

35

46
def get_spec_url(spec, index=0):

openapi_core/spec/paths.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
class SpecPath(AccessorPath):
99

1010
@classmethod
11-
def from_spec(
12-
cls, spec_dict, dereferencer=None, *args,
13-
separator=SPEC_SEPARATOR,
14-
):
11+
def from_spec(cls, spec_dict, dereferencer=None, *args, **kwargs):
12+
separator = kwargs.pop('separator', SPEC_SEPARATOR)
1513
accessor = SpecAccessor(spec_dict, dereferencer)
1614
return cls(accessor, *args, separator=separator)

openapi_core/templating/media_types/finders.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"""OpenAPI core templating media types finders module"""
2+
from __future__ import division
23
import fnmatch
34

45
from six import iteritems

openapi_core/templating/paths/finders.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
"""OpenAPI core templating paths finders module"""
2+
from __future__ import division
3+
24
from more_itertools import peekable
35
from six import iteritems
46
from six.moves.urllib.parse import urljoin, urlparse
57

6-
from openapi_core.spec.servers import is_absolute
8+
from openapi_core.schema.servers import is_absolute
79
from openapi_core.templating.datatypes import TemplateResult
810
from openapi_core.templating.util import parse, search
911
from openapi_core.templating.paths.exceptions import (

openapi_core/templating/responses/finders.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from __future__ import division
2+
13
from openapi_core.templating.responses.exceptions import ResponseNotFound
24

35

openapi_core/unmarshalling/schemas/unmarshallers.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
from __future__ import division
12
from functools import partial
23
import logging
34

@@ -12,7 +13,7 @@
1213
from six import iteritems
1314

1415
from openapi_core.extensions.models.factories import ModelFactory
15-
from openapi_core.spec.schemas import (
16+
from openapi_core.schema.schemas import (
1617
get_all_properties, get_all_properties_names
1718
)
1819
from openapi_core.types import NoValue

openapi_core/validation/request/validators.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"""OpenAPI core validation request validators module"""
2+
from __future__ import division
23
from itertools import chain
34
from six import iteritems
45

@@ -8,7 +9,7 @@
89
MissingRequiredParameter, MissingParameter, MissingRequestBody,
910
)
1011
from openapi_core.security.exceptions import SecurityError
11-
from openapi_core.spec.parameters import get_aslist, get_explode
12+
from openapi_core.schema.parameters import get_aslist, get_explode
1213
from openapi_core.templating.media_types.exceptions import MediaTypeFinderError
1314
from openapi_core.templating.paths.exceptions import PathError
1415
from openapi_core.unmarshalling.schemas.enums import UnmarshalContext

openapi_core/validation/response/validators.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
"""OpenAPI core validation response validators module"""
2+
from __future__ import division
3+
24
from openapi_core.casting.schemas.exceptions import CastError
35
from openapi_core.deserializing.exceptions import DeserializeError
46
from openapi_core.exceptions import MissingResponseContent

openapi_core/validation/validators.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
"""OpenAPI core validation validators module"""
2+
from __future__ import division
3+
24
from openapi_core.unmarshalling.schemas.util import build_format_checker
35

46

tests/integration/schema/test_link_spec.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from __future__ import division
2+
13
from openapi_core.shortcuts import create_spec
24

35

tests/integration/schema/test_path_params.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from __future__ import division
2+
13
import pytest
24

35
from openapi_core.shortcuts import create_spec

tests/integration/schema/test_spec.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
from __future__ import division
12
import pytest
23
from base64 import b64encode
34
from six import iteritems, text_type
45

56
from openapi_core.shortcuts import create_spec
6-
from openapi_core.spec.servers import get_server_url
7-
from openapi_core.spec.specs import get_spec_url
7+
from openapi_core.schema.servers import get_server_url
8+
from openapi_core.schema.specs import get_spec_url
89
from openapi_core.validation.request.validators import RequestValidator
910
from openapi_core.validation.response.validators import ResponseValidator
1011

tests/unit/templating/test_paths_finders.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
from __future__ import division
12
import pytest
23

34
from openapi_core.spec.paths import SpecPath

tests/unit/templating/test_responses_finders.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
from __future__ import division
12
import mock
23
import pytest
34

0 commit comments

Comments
 (0)