Julian/jsonschema#782: Load dependencies from legacy validators

3 files changed, 29 insertions, 27 deletions

diff --git a/jsonschema/_legacy_validators.py b/jsonschema/_legacy_validators.py
index b337151..8e46190 100644
--- a/jsonschema/_legacy_validators.py
+++ b/jsonschema/_legacy_validators.py
@@ -27,6 +27,32 @@ def dependencies_draft3(validator, dependencies, instance, schema):
                     yield ValidationError(message % (each, property))
 
 
+def dependencies_draft4_draft6_draft7(validator, dependencies, instance, schema):
+    """
+    Support for the ``dependencies`` validator from pre-draft 2019-09.
+
+    In later drafts, the validator was split into separate ``dependentRequired``
+    and ``dependentSchemas`` validators.
+    """
+    if not validator.is_type(instance, "object"):
+        return
+
+    for property, dependency in dependencies.items():
+        if property not in instance:
+            continue
+
+        if validator.is_type(dependency, "array"):
+            for each in dependency:
+                if each not in instance:
+                    message = "%r is a dependency of %r"
+                    yield ValidationError(message % (each, property))
+        else:
+            for error in validator.descend(
+                    instance, dependency, schema_path=property,
+            ):
+                yield error
+
+
 def disallow_draft3(validator, disallow, instance, schema):
     for disallowed in _utils.ensure_list(disallow):
         if validator.is_valid(instance, {"type": [disallowed]}):
diff --git a/jsonschema/_validators.py b/jsonschema/_validators.py
index 588d957..093aaba 100644
--- a/jsonschema/_validators.py
+++ b/jsonschema/_validators.py
@@ -301,30 +301,6 @@ def maxLength(validator, mL, instance, schema):
         yield ValidationError("%r is too long" % (instance,))
 
 
-def dependencies(validator, dependencies, instance, schema):
-    """
-    The dependencies keyword has been deprecated since draft 2019-09 and has been split into dependentRequired
-    and dependentSchemas.
-    """
-    if not validator.is_type(instance, "object"):
-        return
-
-    for property, dependency in dependencies.items():
-        if property not in instance:
-            continue
-
-        if validator.is_type(dependency, "array"):
-            for each in dependency:
-                if each not in instance:
-                    message = "%r is a dependency of %r"
-                    yield ValidationError(message % (each, property))
-        else:
-            for error in validator.descend(
-                instance, dependency, schema_path=property,
-            ):
-                yield error
-
-
 def dependentRequired(validator, dependentRequired, instance, schema):
     """
     Split from dependencies
diff --git a/jsonschema/validators.py b/jsonschema/validators.py
index 9acf65a..30f0116 100644
--- a/jsonschema/validators.py
+++ b/jsonschema/validators.py
@@ -326,7 +326,7 @@ Draft4Validator = create(
         u"additionalProperties": _validators.additionalProperties,
         u"allOf": _validators.allOf,
         u"anyOf": _validators.anyOf,
-        u"dependencies": _validators.dependencies,
+        u"dependencies": _legacy_validators.dependencies_draft4_draft6_draft7,
         u"enum": _validators.enum,
         u"format": _validators.format,
         u"items": _legacy_validators.items_draft3_draft4,
@@ -363,7 +363,7 @@ Draft6Validator = create(
         u"anyOf": _validators.anyOf,
         u"const": _validators.const,
         u"contains": _legacy_validators.contains_draft6_draft7,
-        u"dependencies": _validators.dependencies,
+        u"dependencies": _legacy_validators.dependencies_draft4_draft6_draft7,
         u"enum": _validators.enum,
         u"exclusiveMaximum": _validators.exclusiveMaximum,
         u"exclusiveMinimum": _validators.exclusiveMinimum,
@@ -402,7 +402,7 @@ Draft7Validator = create(
         u"anyOf": _validators.anyOf,
         u"const": _validators.const,
         u"contains": _legacy_validators.contains_draft6_draft7,
-        u"dependencies": _validators.dependencies,
+        u"dependencies": _legacy_validators.dependencies_draft4_draft6_draft7,
         u"enum": _validators.enum,
         u"exclusiveMaximum": _validators.exclusiveMaximum,
         u"exclusiveMinimum": _validators.exclusiveMinimum,