Merge pull request #717 from python-openapi/fix/deprecated-spec-validator-fix

Deprecated spec validator fix

Author: p1c2u

openapi_core/spec/paths.py

@@ -1,11 +1,13 @@
+import warnings
 from typing import Any
 from typing import Hashable
 from typing import Mapping
 from typing import Type
 from typing import TypeVar
 
+from jsonschema.validators import _UNSET
 from jsonschema_spec import SchemaPath
-from openapi_spec_validator.validation import openapi_spec_validator_proxy
+from openapi_spec_validator import validate
 
 TSpec = TypeVar("TSpec", bound="Spec")
 
@@ -20,11 +22,22 @@ def from_dict(
         *args: Any,
         **kwargs: Any,
     ) -> TSpec:
-        validator = kwargs.pop("validator", openapi_spec_validator_proxy)
-        if validator is not None:
-            base_uri = kwargs.get("base_uri", "")
-            spec_url = kwargs.get("spec_url")
-            validator.validate(data, base_uri=base_uri, spec_url=spec_url)
+        if "validator" in kwargs:
+            warnings.warn(
+                "validator parameter is deprecated. Use spec_validator_cls instead.",
+                DeprecationWarning,
+            )
+        validator = kwargs.pop("validator", _UNSET)
+        spec_validator_cls = kwargs.pop("spec_validator_cls", _UNSET)
+        base_uri = kwargs.get("base_uri", "")
+        spec_url = kwargs.get("spec_url")
+        if spec_validator_cls is not None:
+            if spec_validator_cls is not _UNSET:
+                validate(data, base_uri=base_uri, cls=spec_validator_cls)
+            elif validator is _UNSET:
+                validate(data, base_uri=base_uri)
+            elif validator is not None:
+                validator.validate(data, base_uri=base_uri, spec_url=spec_url)
 
         return super().from_dict(data, *args, **kwargs)
 

openapi_core/unmarshalling/schemas/unmarshallers.py

@@ -45,7 +45,7 @@ def __call__(self, value: Any) -> Optional[List[Any]]:
     def items_unmarshaller(self) -> "SchemaUnmarshaller":
         # sometimes we don't have any schema i.e. free-form objects
         items_schema = self.schema.get(
-            "items", Spec.from_dict({}, validator=None)
+            "items", Spec.from_dict({}, spec_validator_cls=None)
         )
         return self.schema_unmarshaller.evolve(items_schema)
 
@@ -120,7 +120,7 @@ def _unmarshal_properties(
             # free-form object
             if additional_properties is True:
                 additional_prop_schema = Spec.from_dict(
-                    {"nullable": True}, validator=None
+                    {"nullable": True}, spec_validator_cls=None
                 )
             # defined schema
             else:

poetry.lock

@@ -68,7 +68,7 @@ isodate = "*"
 more-itertools = "*"
 parse = "*"
 openapi-schema-validator = "^0.6.0"
-openapi-spec-validator = "^0.6.0"
+openapi-spec-validator = "^0.7.1"
 requests = {version = "*", optional = true}
 werkzeug = "*"
 jsonschema-spec = "^0.2.3"

pyproject.toml

@@ -103,8 +103,6 @@
 
 USE_I18N = True
 
-USE_L10N = True
-
 USE_TZ = True
 
 

tests/integration/contrib/django/data/v3.0/djangoproject/settings.py

@@ -40,7 +40,6 @@ def test_response_validator_path_pattern(self, response_unmarshaller):
             "http://localhost/browse/12/?q=string",
             json={"data": "data"},
             status=200,
-            match_querystring=True,
             headers={"X-Rate-Limit": "12"},
         )
         request = requests.Request(

tests/integration/contrib/requests/test_requests_validation.py

@@ -1,8 +1,8 @@
 from base64 import b64encode
 
 import pytest
-from openapi_spec_validator import openapi_v30_spec_validator
-from openapi_spec_validator import openapi_v31_spec_validator
+from openapi_spec_validator import OpenAPIV30SpecValidator
+from openapi_spec_validator import OpenAPIV31SpecValidator
 
 from openapi_core import Spec
 from openapi_core import V30RequestValidator
@@ -32,7 +32,9 @@ def spec_dict(self, factory):
     @pytest.fixture
     def spec(self, spec_dict, base_uri):
         return Spec.from_dict(
-            spec_dict, base_uri=base_uri, validator=openapi_v30_spec_validator
+            spec_dict,
+            base_uri=base_uri,
+            spec_validator_cls=OpenAPIV30SpecValidator,
         )
 
     @pytest.fixture
@@ -327,7 +329,7 @@ def spec(self, spec_dict, base_uri):
         return Spec.from_dict(
             spec_dict,
             base_uri=base_uri,
-            validator=openapi_v31_spec_validator,
+            spec_validator_cls=OpenAPIV31SpecValidator,
         )
 
     @pytest.fixture