Add errors_with_property_name

Author: TsankoBg

jsonschema/_utils.py

@@ -338,3 +338,9 @@ def find_evaluated_property_keys_by_schema(validator, instance, schema):
                 )
 
     return evaluated_keys
+
+
+def errors_with_property_name(errors, property_name):
+    for error in errors:
+        error.extra_info = {"property": property_name}
+        yield error

jsonschema/_validators.py

@@ -4,6 +4,7 @@
 
 from jsonschema._utils import (
     ensure_list,
+    errors_with_property_name,
     equal,
     extras_msg,
     find_additional_properties,
@@ -32,7 +33,7 @@ def propertyNames(validator, propertyNames, instance, schema):
         return
 
     for property in instance:
-        yield from add_extra_info_property(validator.descend(instance=property, schema=propertyNames), property)
+        yield from errors_with_property_name(validator.descend(instance=property, schema=propertyNames), property)
 
 def additionalProperties(validator, aP, instance, schema):
     if not validator.is_type(instance, "object"):
@@ -42,7 +43,7 @@ def additionalProperties(validator, aP, instance, schema):
 
     if validator.is_type(aP, "object"):
         for extra in extras:
-            yield from add_extra_info_property(validator.descend(instance[extra], aP, path=extra), extra)
+            yield from errors_with_property_name(validator.descend(instance[extra], aP, path=extra), extra)
     elif not aP and extras:
         extra_info_properties = [extra for extra in sorted(extras)]
         if "patternProperties" in schema:
@@ -64,11 +65,6 @@ def additionalProperties(validator, aP, instance, schema):
                 extra_info={"properties": extra_info_properties}
             )
 
-def add_extra_info_property(errors, property_name):
-    for error in errors:
-        error.extra_info = {"property": property_name}
-        yield error
-
 def items(validator, items, instance, schema):
     if not validator.is_type(instance, "array"):
         return
@@ -102,7 +98,6 @@ def additionalItems(validator, aI, instance, schema):
         error = "Additional items are not allowed (%s %s unexpected)"
         yield ValidationError(
             error % extras_msg(instance[len(schema.get("items", [])):]),
-            extra_info={"additionalItems": instance[len(schema.get("items", [])):]}
         )
 
 

jsonschema/tests/test_validators.py

@@ -608,49 +608,39 @@ def test_unevaluated_properties(self):
 class TestValidationErrorDetails(TestCase):
     # TODO: These really need unit tests for each individual validator, rather
     #       than just these higher level tests.
-    def test_required(self):
-        instance = {'a': 1}
+    def test_extra_info_required(self):
+        instance = {"a": 1}
         schema = {
-            'required': ['b', 'c'],
+            "required": ["b", "c"],
         }
 
         validator = validators.Draft4Validator(schema)
         e1, e2 = validator.iter_errors(instance)
-        self.assertEqual(e1.extra_info, {'property': 'b'})
-        self.assertEqual(e2.extra_info, {'property': 'c'})
+        self.assertEqual(e1.extra_info, {"property": "b"})
+        self.assertEqual(e2.extra_info, {"property": "c"})
 
     def test_extra_info_additionalProperties_single(self):
-        instance = {'a': 1}
+        instance = {"a": 1}
         schema = {"additionalProperties": False}
 
         validator = validators.Draft4Validator(schema)
         e1, = validator.iter_errors(instance)
-        self.assertEqual(e1.extra_info, {'properties': ['a']})
+        self.assertEqual(e1.extra_info, {"properties": ["a"]})
 
     def test_extra_info_additionalProperties_multiple(self):
-        instance = {'a': 1,'b': 2}
+        instance = {"a": 1,"b": 2}
         schema = {"additionalProperties": False}
 
         validator = validators.Draft4Validator(schema)
         e1, = validator.iter_errors(instance)
-        self.assertEqual(e1.extra_info, {'properties': ['a', 'b']})
+        self.assertEqual(e1.extra_info, {"properties": ["a", "b"]})
 
     def test_extra_info_dependentRequired(self):
         instance = {"a": {}}
         schema = {"dependentRequired": {"a": ["bar"]}}
         validator = validators.Draft202012Validator(schema)
         e1, = validator.iter_errors(instance)
-        self.assertEqual(e1.extra_info, {'property': 'a'})
-
-    def test_extra_info_additionalItems(self):
-        instance = ["a", "b"]
-        schema = {
-            "items": [],
-            "additionalItems": False,
-        }
-        validator = validators.Draft7Validator(schema)
-        e1, = validator.iter_errors(instance)
-        self.assertEqual(e1.extra_info, {"additionalItems": ["a", "b"]})
+        self.assertEqual(e1.extra_info, {"property": "a"})
 
     def test_anyOf(self):
         instance = 5
@@ -1094,7 +1084,7 @@ def test_propertyNames(self):
         self.assertEqual(error.json_path, "$")
         self.assertEqual(error.schema_path, deque(["propertyNames", "not"]))
 
-        self.assertEqual(error.extra_info, {'property': 'foo'})
+        self.assertEqual(error.extra_info, {"property": "foo"})
 
     def test_if_then(self):
         schema = {