allOf

Author: Julian

jsonschema/_validators.py

@@ -291,7 +291,7 @@ def type(validator, types, instance, schema):
         yield ValidationError(_utils.types_msg(instance, types))
 
 
-def properties_draft4(validator, properties, instance, schema):
+def properties(validator, properties, instance, schema):
     if not validator.is_type(instance, "object"):
         return
 
@@ -306,7 +306,7 @@ def properties_draft4(validator, properties, instance, schema):
                 yield error
 
 
-def required_draft4(validator, required, instance, schema):
+def required(validator, required, instance, schema):
     if not validator.is_type(instance, "object"):
         return
     for property in required:
@@ -328,12 +328,22 @@ def maxProperties_draft4(validator, mP, instance, schema):
         yield ValidationError("%r has too many properties" % (instance,))
 
 
-def allOf(validator, allOf, instance, schema):
+def allOf_draft4(validator, allOf, instance, schema):
     for index, subschema in enumerate(allOf):
         for error in validator.descend(instance, subschema, schema_path=index):
             yield error
 
 
+def allOf_draft6(validator, allOf, instance, schema):
+    for index, subschema in enumerate(allOf):
+        if subschema == True:  # FIXME: Messages
+            subschema = {}
+        elif subschema == False:
+            subschema = {"not": {}}
+        for error in validator.descend(instance, subschema, schema_path=index):
+            yield error
+
+
 def oneOf_draft4(validator, oneOf, instance, schema):
     subschemas = enumerate(oneOf)
     all_errors = []
@@ -372,7 +382,7 @@ def anyOf_draft4(validator, anyOf, instance, schema):
         )
 
 
-def not_draft4(validator, not_schema, instance, schema):
+def not_(validator, not_schema, instance, schema):
     if validator.is_valid(instance, not_schema):
         yield ValidationError(
             "%r is not allowed for %r" % (not_schema, instance)

jsonschema/validators.py

@@ -206,7 +206,7 @@ def extend(validator, validators, version=None):
         u"$ref": _validators.ref,
         u"additionalItems": _validators.additionalItems,
         u"additionalProperties": _validators.additionalProperties,
-        u"allOf": _validators.allOf,
+        u"allOf": _validators.allOf_draft4,
         u"anyOf": _validators.anyOf_draft4,
         u"dependencies": _validators.dependencies,
         u"enum": _validators.enum,
@@ -221,12 +221,12 @@ def extend(validator, validators, version=None):
         u"minProperties": _validators.minProperties_draft4,
         u"minimum": _validators.minimum,
         u"multipleOf": _validators.multipleOf,
-        u"not": _validators.not_draft4,
+        u"not": _validators.not_,
         u"oneOf": _validators.oneOf_draft4,
         u"pattern": _validators.pattern,
         u"patternProperties": _validators.patternProperties,
-        u"properties": _validators.properties_draft4,
-        u"required": _validators.required_draft4,
+        u"properties": _validators.properties,
+        u"required": _validators.required,
         u"type": _validators.type,
         u"uniqueItems": _validators.uniqueItems,
     },
@@ -239,7 +239,13 @@ def extend(validator, validators, version=None):
     validators={
         u"additionalItems": _validators.additionalItems,
         u"additionalProperties": _validators.additionalProperties,
+        u"allOf": _validators.allOf_draft6,
         u"items": _validators.items,
+        u"maximum": _validators.maximum,
+        u"minimum": _validators.minimum,
+        u"not": _validators.not_,
+        u"properties": _validators.properties,
+        u"required": _validators.required,
         u"type": _validators.type,
     },
     version="draft6",