Merge pull request #47 from p1c2u/fix/jsonschema-4-10-0-compatibility-fix

jsonschema subclassing fix

Author: p1c2u

openapi_schema_validator/_validators.py

@@ -1,9 +1,27 @@
+from copy import deepcopy
+
 from jsonschema._utils import find_additional_properties, extras_msg
 from jsonschema._validators import oneOf as _oneOf, anyOf as _anyOf, allOf as _allOf
 
 from jsonschema.exceptions import ValidationError, FormatError
 
 
+def include_nullable_validator(schema):
+    """
+    Include ``nullable`` validator always.
+    Suitable for use with `create`'s ``applicable_validators`` argument.
+    """
+    _schema = deepcopy(schema)
+
+    # append defaults to trigger nullable validator
+    if 'nullable' not in _schema:
+        _schema.update({
+            'nullable': False,
+        })
+
+    return _schema.items()
+
+
 def handle_discriminator(validator, _, instance, schema):
     """
     Handle presence of discriminator in anyOf, oneOf and allOf.

openapi_schema_validator/validators.py

@@ -54,9 +54,10 @@
     # See https://github.com/p1c2u/openapi-schema-validator/pull/12
     # version="oas30",
     id_of=lambda schema: schema.get(u"id", ""),
+    applicable_validators=oas_validators.include_nullable_validator,
 )
 
-BaseOAS31Validator = extend(
+OAS31Validator = extend(
     Draft202012Validator,
     {
         # adjusted to OAS
@@ -81,20 +82,11 @@ class OAS30Validator(BaseOAS30Validator):
     read: bool = attrib(default=None)
     write: bool = attrib(default=None)
 
-    def iter_errors(self, instance, _schema=None):
-        if _schema is None:
-            # creates a copy by value from schema to prevent mutation
-            _schema = deepcopy(self.schema)
-
-        # append defaults to trigger validator (i.e. nullable)
-        if 'nullable' not in _schema:
-            _schema.update({
-                'nullable': False,
-            })
-
-        validator = self.evolve(schema=_schema)
-        return super(OAS30Validator, validator).iter_errors(instance)
-
-
-class OAS31Validator(BaseOAS31Validator):
-    pass
+    @classmethod
+    def __init_subclass__(cls):
+        # Subclassing validator classes is not intended to
+        # be part of their public API
+        # but it's the only way to pass extra context
+        # to the validator
+        # See https://github.com/p1c2u/openapi-schema-validator/issues/48
+        pass