summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Berman <Julian@GrayVines.com>2021-08-17 08:04:41 +0100
committerJulian Berman <Julian@GrayVines.com>2021-08-17 08:04:41 +0100
commit1a856842b741459122f87a6ba01582c80dd9a4a3 (patch)
tree3270ede2807278b7f86bdba19a490ad00c0b13e3
parent372710bd7a6a17d55be28b6235bd08ea796dc48a (diff)
downloadjsonschema-1a856842b741459122f87a6ba01582c80dd9a4a3.tar.gz
Remove some u prefixes leftover from Py2.
-rw-r--r--jsonschema/validators.py320
1 files changed, 160 insertions, 160 deletions
diff --git a/jsonschema/validators.py b/jsonschema/validators.py
index 9e6bf1e..ed02767 100644
--- a/jsonschema/validators.py
+++ b/jsonschema/validators.py
@@ -64,8 +64,8 @@ def validates(version):
def _id_of(schema):
if schema is True or schema is False:
- return u""
- return schema.get(u"$id", u"")
+ return ""
+ return schema.get("$id", "")
def _store_schema_list():
@@ -198,7 +198,7 @@ def create(
instance=instance,
schema=_schema,
)
- if k not in {u"if", u"$ref"}:
+ if k not in {"if", "$ref"}:
error.schema_path.appendleft(k)
yield error
finally:
@@ -304,104 +304,104 @@ def extend(validator, validators=(), version=None, type_checker=None):
Draft3Validator = create(
meta_schema=_utils.load_schema("draft3"),
validators={
- u"$ref": _validators.ref,
- u"additionalItems": _validators.additionalItems,
- u"additionalProperties": _validators.additionalProperties,
- u"dependencies": _legacy_validators.dependencies_draft3,
- u"disallow": _legacy_validators.disallow_draft3,
- u"divisibleBy": _validators.multipleOf,
- u"enum": _validators.enum,
- u"extends": _legacy_validators.extends_draft3,
- u"format": _validators.format,
- u"items": _legacy_validators.items_draft3_draft4,
- u"maxItems": _validators.maxItems,
- u"maxLength": _validators.maxLength,
- u"maximum": _legacy_validators.maximum_draft3_draft4,
- u"minItems": _validators.minItems,
- u"minLength": _validators.minLength,
- u"minimum": _legacy_validators.minimum_draft3_draft4,
- u"pattern": _validators.pattern,
- u"patternProperties": _validators.patternProperties,
- u"properties": _legacy_validators.properties_draft3,
- u"type": _legacy_validators.type_draft3,
- u"uniqueItems": _validators.uniqueItems,
+ "$ref": _validators.ref,
+ "additionalItems": _validators.additionalItems,
+ "additionalProperties": _validators.additionalProperties,
+ "dependencies": _legacy_validators.dependencies_draft3,
+ "disallow": _legacy_validators.disallow_draft3,
+ "divisibleBy": _validators.multipleOf,
+ "enum": _validators.enum,
+ "extends": _legacy_validators.extends_draft3,
+ "format": _validators.format,
+ "items": _legacy_validators.items_draft3_draft4,
+ "maxItems": _validators.maxItems,
+ "maxLength": _validators.maxLength,
+ "maximum": _legacy_validators.maximum_draft3_draft4,
+ "minItems": _validators.minItems,
+ "minLength": _validators.minLength,
+ "minimum": _legacy_validators.minimum_draft3_draft4,
+ "pattern": _validators.pattern,
+ "patternProperties": _validators.patternProperties,
+ "properties": _legacy_validators.properties_draft3,
+ "type": _legacy_validators.type_draft3,
+ "uniqueItems": _validators.uniqueItems,
},
type_checker=_types.draft3_type_checker,
version="draft3",
- id_of=lambda schema: schema.get(u"id", ""),
+ id_of=lambda schema: schema.get("id", ""),
applicable_validators=_legacy_validators.ignore_ref_siblings,
)
Draft4Validator = create(
meta_schema=_utils.load_schema("draft4"),
validators={
- u"$ref": _validators.ref,
- u"additionalItems": _validators.additionalItems,
- u"additionalProperties": _validators.additionalProperties,
- u"allOf": _validators.allOf,
- u"anyOf": _validators.anyOf,
- u"dependencies": _legacy_validators.dependencies_draft4_draft6_draft7,
- u"enum": _validators.enum,
- u"format": _validators.format,
- u"items": _legacy_validators.items_draft3_draft4,
- u"maxItems": _validators.maxItems,
- u"maxLength": _validators.maxLength,
- u"maxProperties": _validators.maxProperties,
- u"maximum": _legacy_validators.maximum_draft3_draft4,
- u"minItems": _validators.minItems,
- u"minLength": _validators.minLength,
- u"minProperties": _validators.minProperties,
- u"minimum": _legacy_validators.minimum_draft3_draft4,
- u"multipleOf": _validators.multipleOf,
- u"not": _validators.not_,
- u"oneOf": _validators.oneOf,
- u"pattern": _validators.pattern,
- u"patternProperties": _validators.patternProperties,
- u"properties": _validators.properties,
- u"required": _validators.required,
- u"type": _validators.type,
- u"uniqueItems": _validators.uniqueItems,
+ "$ref": _validators.ref,
+ "additionalItems": _validators.additionalItems,
+ "additionalProperties": _validators.additionalProperties,
+ "allOf": _validators.allOf,
+ "anyOf": _validators.anyOf,
+ "dependencies": _legacy_validators.dependencies_draft4_draft6_draft7,
+ "enum": _validators.enum,
+ "format": _validators.format,
+ "items": _legacy_validators.items_draft3_draft4,
+ "maxItems": _validators.maxItems,
+ "maxLength": _validators.maxLength,
+ "maxProperties": _validators.maxProperties,
+ "maximum": _legacy_validators.maximum_draft3_draft4,
+ "minItems": _validators.minItems,
+ "minLength": _validators.minLength,
+ "minProperties": _validators.minProperties,
+ "minimum": _legacy_validators.minimum_draft3_draft4,
+ "multipleOf": _validators.multipleOf,
+ "not": _validators.not_,
+ "oneOf": _validators.oneOf,
+ "pattern": _validators.pattern,
+ "patternProperties": _validators.patternProperties,
+ "properties": _validators.properties,
+ "required": _validators.required,
+ "type": _validators.type,
+ "uniqueItems": _validators.uniqueItems,
},
type_checker=_types.draft4_type_checker,
version="draft4",
- id_of=lambda schema: schema.get(u"id", ""),
+ id_of=lambda schema: schema.get("id", ""),
applicable_validators=_legacy_validators.ignore_ref_siblings,
)
Draft6Validator = create(
meta_schema=_utils.load_schema("draft6"),
validators={
- u"$ref": _validators.ref,
- u"additionalItems": _validators.additionalItems,
- u"additionalProperties": _validators.additionalProperties,
- u"allOf": _validators.allOf,
- u"anyOf": _validators.anyOf,
- u"const": _validators.const,
- u"contains": _legacy_validators.contains_draft6_draft7,
- u"dependencies": _legacy_validators.dependencies_draft4_draft6_draft7,
- u"enum": _validators.enum,
- u"exclusiveMaximum": _validators.exclusiveMaximum,
- u"exclusiveMinimum": _validators.exclusiveMinimum,
- u"format": _validators.format,
- u"items": _legacy_validators.items_draft6_draft7,
- u"maxItems": _validators.maxItems,
- u"maxLength": _validators.maxLength,
- u"maxProperties": _validators.maxProperties,
- u"maximum": _validators.maximum,
- u"minItems": _validators.minItems,
- u"minLength": _validators.minLength,
- u"minProperties": _validators.minProperties,
- u"minimum": _validators.minimum,
- u"multipleOf": _validators.multipleOf,
- u"not": _validators.not_,
- u"oneOf": _validators.oneOf,
- u"pattern": _validators.pattern,
- u"patternProperties": _validators.patternProperties,
- u"properties": _validators.properties,
- u"propertyNames": _validators.propertyNames,
- u"required": _validators.required,
- u"type": _validators.type,
- u"uniqueItems": _validators.uniqueItems,
+ "$ref": _validators.ref,
+ "additionalItems": _validators.additionalItems,
+ "additionalProperties": _validators.additionalProperties,
+ "allOf": _validators.allOf,
+ "anyOf": _validators.anyOf,
+ "const": _validators.const,
+ "contains": _legacy_validators.contains_draft6_draft7,
+ "dependencies": _legacy_validators.dependencies_draft4_draft6_draft7,
+ "enum": _validators.enum,
+ "exclusiveMaximum": _validators.exclusiveMaximum,
+ "exclusiveMinimum": _validators.exclusiveMinimum,
+ "format": _validators.format,
+ "items": _legacy_validators.items_draft6_draft7,
+ "maxItems": _validators.maxItems,
+ "maxLength": _validators.maxLength,
+ "maxProperties": _validators.maxProperties,
+ "maximum": _validators.maximum,
+ "minItems": _validators.minItems,
+ "minLength": _validators.minLength,
+ "minProperties": _validators.minProperties,
+ "minimum": _validators.minimum,
+ "multipleOf": _validators.multipleOf,
+ "not": _validators.not_,
+ "oneOf": _validators.oneOf,
+ "pattern": _validators.pattern,
+ "patternProperties": _validators.patternProperties,
+ "properties": _validators.properties,
+ "propertyNames": _validators.propertyNames,
+ "required": _validators.required,
+ "type": _validators.type,
+ "uniqueItems": _validators.uniqueItems,
},
type_checker=_types.draft6_type_checker,
version="draft6",
@@ -411,38 +411,38 @@ Draft6Validator = create(
Draft7Validator = create(
meta_schema=_utils.load_schema("draft7"),
validators={
- u"$ref": _validators.ref,
- u"additionalItems": _validators.additionalItems,
- u"additionalProperties": _validators.additionalProperties,
- u"allOf": _validators.allOf,
- u"anyOf": _validators.anyOf,
- u"const": _validators.const,
- u"contains": _legacy_validators.contains_draft6_draft7,
- u"dependencies": _legacy_validators.dependencies_draft4_draft6_draft7,
- u"enum": _validators.enum,
- u"exclusiveMaximum": _validators.exclusiveMaximum,
- u"exclusiveMinimum": _validators.exclusiveMinimum,
- u"format": _validators.format,
- u"if": _validators.if_,
- u"items": _legacy_validators.items_draft6_draft7,
- u"maxItems": _validators.maxItems,
- u"maxLength": _validators.maxLength,
- u"maxProperties": _validators.maxProperties,
- u"maximum": _validators.maximum,
- u"minItems": _validators.minItems,
- u"minLength": _validators.minLength,
- u"minProperties": _validators.minProperties,
- u"minimum": _validators.minimum,
- u"multipleOf": _validators.multipleOf,
- u"oneOf": _validators.oneOf,
- u"not": _validators.not_,
- u"pattern": _validators.pattern,
- u"patternProperties": _validators.patternProperties,
- u"properties": _validators.properties,
- u"propertyNames": _validators.propertyNames,
- u"required": _validators.required,
- u"type": _validators.type,
- u"uniqueItems": _validators.uniqueItems,
+ "$ref": _validators.ref,
+ "additionalItems": _validators.additionalItems,
+ "additionalProperties": _validators.additionalProperties,
+ "allOf": _validators.allOf,
+ "anyOf": _validators.anyOf,
+ "const": _validators.const,
+ "contains": _legacy_validators.contains_draft6_draft7,
+ "dependencies": _legacy_validators.dependencies_draft4_draft6_draft7,
+ "enum": _validators.enum,
+ "exclusiveMaximum": _validators.exclusiveMaximum,
+ "exclusiveMinimum": _validators.exclusiveMinimum,
+ "format": _validators.format,
+ "if": _validators.if_,
+ "items": _legacy_validators.items_draft6_draft7,
+ "maxItems": _validators.maxItems,
+ "maxLength": _validators.maxLength,
+ "maxProperties": _validators.maxProperties,
+ "maximum": _validators.maximum,
+ "minItems": _validators.minItems,
+ "minLength": _validators.minLength,
+ "minProperties": _validators.minProperties,
+ "minimum": _validators.minimum,
+ "multipleOf": _validators.multipleOf,
+ "oneOf": _validators.oneOf,
+ "not": _validators.not_,
+ "pattern": _validators.pattern,
+ "patternProperties": _validators.patternProperties,
+ "properties": _validators.properties,
+ "propertyNames": _validators.propertyNames,
+ "required": _validators.required,
+ "type": _validators.type,
+ "uniqueItems": _validators.uniqueItems,
},
type_checker=_types.draft7_type_checker,
version="draft7",
@@ -453,44 +453,44 @@ Draft202012Validator = create(
meta_schema=_utils.load_schema("draft2020-12"),
vocabulary_schemas=_utils.load_vocabulary("draft2020-12"),
validators={
- u"$ref": _validators.ref,
- u"$defs": _validators.defs,
- u"$dynamicRef": _validators.dynamicRef,
- u"additionalItems": _validators.additionalItems,
- u"additionalProperties": _validators.additionalProperties,
- u"allOf": _validators.allOf,
- u"anyOf": _validators.anyOf,
- u"const": _validators.const,
- u"contains": _validators.contains,
- u"dependentRequired": _validators.dependentRequired,
- u"dependentSchemas": _validators.dependentSchemas,
- u"enum": _validators.enum,
- u"exclusiveMaximum": _validators.exclusiveMaximum,
- u"exclusiveMinimum": _validators.exclusiveMinimum,
- u"format": _validators.format,
- u"if": _validators.if_,
- u"items": _validators.items,
- u"maxItems": _validators.maxItems,
- u"maxLength": _validators.maxLength,
- u"maxProperties": _validators.maxProperties,
- u"maximum": _validators.maximum,
- u"minItems": _validators.minItems,
- u"minLength": _validators.minLength,
- u"minProperties": _validators.minProperties,
- u"minimum": _validators.minimum,
- u"multipleOf": _validators.multipleOf,
- u"oneOf": _validators.oneOf,
- u"not": _validators.not_,
- u"pattern": _validators.pattern,
- u"patternProperties": _validators.patternProperties,
- u"properties": _validators.properties,
- u"propertyNames": _validators.propertyNames,
- u"required": _validators.required,
- u"type": _validators.type,
- u"uniqueItems": _validators.uniqueItems,
- u"unevaluatedItems": _validators.unevaluatedItems,
- u"unevaluatedProperties": _validators.unevaluatedProperties,
- u"prefixItems": _validators.prefixItems,
+ "$ref": _validators.ref,
+ "$defs": _validators.defs,
+ "$dynamicRef": _validators.dynamicRef,
+ "additionalItems": _validators.additionalItems,
+ "additionalProperties": _validators.additionalProperties,
+ "allOf": _validators.allOf,
+ "anyOf": _validators.anyOf,
+ "const": _validators.const,
+ "contains": _validators.contains,
+ "dependentRequired": _validators.dependentRequired,
+ "dependentSchemas": _validators.dependentSchemas,
+ "enum": _validators.enum,
+ "exclusiveMaximum": _validators.exclusiveMaximum,
+ "exclusiveMinimum": _validators.exclusiveMinimum,
+ "format": _validators.format,
+ "if": _validators.if_,
+ "items": _validators.items,
+ "maxItems": _validators.maxItems,
+ "maxLength": _validators.maxLength,
+ "maxProperties": _validators.maxProperties,
+ "maximum": _validators.maximum,
+ "minItems": _validators.minItems,
+ "minLength": _validators.minLength,
+ "minProperties": _validators.minProperties,
+ "minimum": _validators.minimum,
+ "multipleOf": _validators.multipleOf,
+ "oneOf": _validators.oneOf,
+ "not": _validators.not_,
+ "pattern": _validators.pattern,
+ "patternProperties": _validators.patternProperties,
+ "properties": _validators.properties,
+ "propertyNames": _validators.propertyNames,
+ "required": _validators.required,
+ "type": _validators.type,
+ "uniqueItems": _validators.uniqueItems,
+ "unevaluatedItems": _validators.unevaluatedItems,
+ "unevaluatedProperties": _validators.unevaluatedProperties,
+ "prefixItems": _validators.prefixItems,
},
type_checker=_types.draft202012_type_checker,
version="draft2020-12",
@@ -740,7 +740,7 @@ class RefResolver(object):
a URI fragment to resolve within it
"""
- fragment = fragment.lstrip(u"/")
+ fragment = fragment.lstrip("/")
# Resolve fragment via $anchor or $dynamicAnchor
if fragment:
@@ -750,9 +750,9 @@ class RefResolver(object):
return subschema
# Resolve via path
- parts = unquote(fragment).split(u"/") if fragment else []
+ parts = unquote(fragment).split("/") if fragment else []
for part in parts:
- part = part.replace(u"~1", u"/").replace(u"~0", u"~")
+ part = part.replace("~1", "/").replace("~0", "~")
if isinstance(document, Sequence):
# Array indexes should be turned into integers
@@ -807,7 +807,7 @@ class RefResolver(object):
if scheme in self.handlers:
result = self.handlers[scheme](uri)
- elif scheme in [u"http", u"https"] and requests:
+ elif scheme in ["http", "https"] and requests:
# Requests has support for detecting the correct encoding of
# json over http
result = requests.get(uri).json()
@@ -908,9 +908,9 @@ def validator_for(schema, default=_LATEST_VERSION):
If unprovided, the default is to return the latest supported
draft.
"""
- if schema is True or schema is False or u"$schema" not in schema:
+ if schema is True or schema is False or "$schema" not in schema:
return default
- if schema[u"$schema"] not in meta_schemas:
+ if schema["$schema"] not in meta_schemas:
warn(
(
"The metaschema specified by $schema was not found. "
@@ -920,4 +920,4 @@ def validator_for(schema, default=_LATEST_VERSION):
DeprecationWarning,
stacklevel=2,
)
- return meta_schemas.get(schema[u"$schema"], _LATEST_VERSION)
+ return meta_schemas.get(schema["$schema"], _LATEST_VERSION)