Skip to content

Fix additionalItems behavior when items is not in tuple form. #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 27, 2012
Merged

Fix additionalItems behavior when items is not in tuple form. #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a4a4ef
Fix additionalItems behavior when items is not in tuple form.
gazpachoking Sep 27, 2012
688420f
Merge branch 'master' into additionalItems_fix
gazpachoking Sep 27, 2012
0522f91
Fix bad merge.
gazpachoking Sep 27, 2012
2d4a16b
Fix another merge problem.
gazpachoking Sep 27, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion jsonschema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,8 @@ def validate_items(self, items, instance, schema):
def validate_additionalItems(self, aI, instance, schema):
if not self.is_type(instance, "array"):
return
if not self.is_type(schema.get("items"), "array"):
return

if self.is_type(aI, "object"):
for item in instance[len(schema):]:
Expand All @@ -454,7 +456,7 @@ def validate_additionalItems(self, aI, instance, schema):
elif not aI and len(instance) > len(schema.get("items", [])):
error = "Additional items are not allowed (%s %s unexpected)"
yield ValidationError(
error % _extras_msg(instance[len(schema) - 1:])
error % _extras_msg(instance[len(schema.get("items", [])):])
)

def validate_minimum(self, minimum, instance, schema):
Expand Down
9 changes: 7 additions & 2 deletions tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,9 @@ def test_additionalItems_allowed_by_default(self):
"additionalItems" : {"type" : "integer"},
}))

def test_additionalItems_ignored_when_items_is_not_tuple(self):
validate([1, 2], {"additionalItems" : False})

@parametrized(
("false_by_default", "valid", {}, {}),
("false_explicit", "valid", {"required" : False}, {}),
Expand Down Expand Up @@ -685,11 +688,13 @@ def test_dependencies_failure_has_single_element_not_list(self):
self.assertEqual(message, "%r is a dependency of %r" % (on, depend))

def test_additionalItems_single_failure(self):
message = self.message_for([2], {"additionalItems" : False})
message = self.message_for([2],
{"items" : [], "additionalItems" : False})
self.assertIn("(2 was unexpected)", message)

def test_additionalItems_multiple_failures(self):
message = self.message_for([1, 2, 3], {"additionalItems" : False})
message = self.message_for([1, 2, 3],
{"items" : [], "additionalItems" : False})
self.assertIn("(1, 2, 3 were unexpected)", message)

def test_additionalProperties_single_failure(self):
Expand Down