From b7289fe17815b7d10dd15c8c142ebeca23921891 Mon Sep 17 00:00:00 2001 From: AndrewSC Date: Tue, 23 Jul 2013 10:44:46 -0500 Subject: [PATCH 1/2] fixing message --- jsonschema/_validators.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsonschema/_validators.py b/jsonschema/_validators.py index 5246dfa7a..fb280c561 100644 --- a/jsonschema/_validators.py +++ b/jsonschema/_validators.py @@ -306,7 +306,7 @@ def maxProperties_draft4(validator, mP, instance, schema): if not validator.is_type(instance, "object"): return if validator.is_type(instance, "object") and len(instance) > mP: - yield ValidationError("%r is too short" % (instance,)) + yield ValidationError("%r is too long" % (instance,)) def allOf_draft4(validator, allOf, instance, schema): From 090290de8a095825bc25008adbad089df52ca818 Mon Sep 17 00:00:00 2001 From: AndrewSC Date: Tue, 23 Jul 2013 18:24:27 -0500 Subject: [PATCH 2/2] Changed wording for minProperties and maxProperties --- .gitignore | 1 + jsonschema/_validators.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 46731db1a..4ea74548c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .DS_Store +.idea *.pyc *.pyo diff --git a/jsonschema/_validators.py b/jsonschema/_validators.py index fb280c561..ae140fc66 100644 --- a/jsonschema/_validators.py +++ b/jsonschema/_validators.py @@ -299,14 +299,14 @@ def required_draft4(validator, required, instance, schema): def minProperties_draft4(validator, mP, instance, schema): if validator.is_type(instance, "object") and len(instance) < mP: - yield ValidationError("%r is too short" % (instance,)) + yield ValidationError("%r does not have enough properties" % (instance,)) def maxProperties_draft4(validator, mP, instance, schema): if not validator.is_type(instance, "object"): return if validator.is_type(instance, "object") and len(instance) > mP: - yield ValidationError("%r is too long" % (instance,)) + yield ValidationError("%r has too many properties" % (instance,)) def allOf_draft4(validator, allOf, instance, schema):