Better error message for additionalProperties: false when there are patternProperties#317
Merged
Julian merged 2 commits intopython-jsonschema:masterfrom Jan 26, 2017
Conversation
…atternProperties.
Julian
approved these changes
Jan 26, 2017
Member
Julian
left a comment
There was a problem hiding this comment.
Thanks, really appreciated!
Some nitpickin' because I can never resist, but overall looks good!
jsonschema/_validators.py
Outdated
| error = "Additional properties are not allowed (%s %s unexpected)" | ||
| yield ValidationError(error % _utils.extras_msg(extras)) | ||
| if "patternProperties" in schema: | ||
| patterns = sorted(schema["patternProperties"].keys()) |
jsonschema/_validators.py
Outdated
| verb = "does" | ||
| else: | ||
| verb = "do" | ||
| error = "%s %s not match any of the regexs: %s" % ( |
jsonschema/tests/test_validators.py
Outdated
| schema = {u"type": u"object", | ||
| u"additionalProperties": False, | ||
| u"patternProperties": { | ||
| u"$abc^": {u"type": u"string"}, |
Member
There was a problem hiding this comment.
Nitpick: can you change these to slightly more realistic regexes, e.g. ^abc$ :)?
jsonschema/tests/test_validators.py
Outdated
| self.assertEqual( | ||
| message, | ||
| "{} does not match any of the regexs: $abc^, $def^".format( | ||
| repr(u"zebra"))) |
Member
There was a problem hiding this comment.
Nitpick: can you change the formatting here to not combine parens, e.g.
self.assertEqual(
message,
"whawefiuhweifuhiweuhfiwuehfiuwheftever".format(
repr(stuff),
),
)
so that each one gets a trailing comma?
jsonschema/_validators.py
Outdated
| else: | ||
| verb = "do" | ||
| error = "%s %s not match any of the regexs: %s" % ( | ||
| ", ".join(map(repr, sorted(extras))), verb, ", ".join(patterns)) |
Member
There was a problem hiding this comment.
Any reason to map repr for the first argument but not for the patterns?
Still would be a bit confusing I think if patterns ended up having the empty string in it.
Author
|
OK, updated. |
Author
|
Travis CI issue appears to be unrelated at this point. |
Member
|
Bleh, yeah, OK, should have Travis CI fixed now, PyPy3 fun. Thanks though! Looks good, merging, appreciated. Now for a release... |
Julian
added a commit
that referenced
this pull request
Jun 30, 2022
39d1d24d Merge pull request #317 from Relequestual/#291 b683de5a Forward-port and reword the new unevaluatedItems test. 816441f4 Add tests for Single-schema items and unevaluatedItems Resolves #291 1e0ebd20 Merge pull request #563 from json-schema-org/update-sanity-checker e1dbaebb Merge pull request #562 from json-schema-org/remove-conditional-id-tests-from-draft6 53da77f3 Update the sanity checker to use a version which supports 2019+. 5aff83e5 reintroduce tests without using if/then/else 9495e3e4 remove conditional $id tests from draft 6 git-subtree-dir: json git-subtree-split: 39d1d24dbc1920953dec90369edec5a2fa7158fa
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #316