diff options
| author | Colin Dunklau <colin.dunklau@gmail.com> | 2013-05-12 16:58:38 -0500 |
|---|---|---|
| committer | Colin Dunklau <colin.dunklau@gmail.com> | 2013-05-12 16:58:38 -0500 |
| commit | 298106763a15e8c55302120fe35910074b007988 (patch) | |
| tree | 2ae6d56c196923f805d06e65ba6ed778b798b106 /jsonschema | |
| parent | 0939679e8fed9618f5107f6376382e40e450087c (diff) | |
| download | jsonschema-298106763a15e8c55302120fe35910074b007988.tar.gz | |
Nicer name for string-listify function
Diffstat (limited to 'jsonschema')
| -rw-r--r-- | jsonschema/__init__.py | 8 | ||||
| -rw-r--r-- | jsonschema/_utils.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/jsonschema/__init__.py b/jsonschema/__init__.py index a0ade70..60a0013 100644 --- a/jsonschema/__init__.py +++ b/jsonschema/__init__.py @@ -430,7 +430,7 @@ class _Draft34CommonMixin(object): ): yield error else: - dependencies = _utils.list_wrap_str(dependency) + dependencies = _utils.ensure_list(dependency) for dependency in dependencies: if dependency not in instance: yield ValidationError( @@ -455,7 +455,7 @@ class Draft3Validator(ValidatorMixin, _Draft34CommonMixin, object): """ def validate_type(self, types, instance, schema): - types = _utils.list_wrap_str(types) + types = _utils.ensure_list(types) all_errors = [] for index, type in enumerate(types): @@ -500,7 +500,7 @@ class Draft3Validator(ValidatorMixin, _Draft34CommonMixin, object): yield error def validate_disallow(self, disallow, instance, schema): - for disallowed in _utils.list_wrap_str(disallow): + for disallowed in _utils.ensure_list(disallow): if self.is_valid(instance, {"type" : [disallowed]}): yield ValidationError( "%r is disallowed for %r" % (disallowed, instance) @@ -609,7 +609,7 @@ class Draft4Validator(ValidatorMixin, _Draft34CommonMixin, object): """ def validate_type(self, types, instance, schema): - types = _utils.list_wrap_str(types) + types = _utils.ensure_list(types) if not any(self.is_type(instance, type) for type in types): yield ValidationError(_utils.types_msg(instance, types)) diff --git a/jsonschema/_utils.py b/jsonschema/_utils.py index 44d0852..3cd985a 100644 --- a/jsonschema/_utils.py +++ b/jsonschema/_utils.py @@ -136,7 +136,7 @@ def flatten(suitable_for_isinstance): return tuple(types) -def list_wrap_str(thing): +def ensure_list(thing): """ Wrap ``thing`` in a list if it's a single str. |