summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarald Nezbeda <hn@nezhar.com>2021-06-24 18:41:40 +0200
committerHarald Nezbeda <hn@nezhar.com>2021-06-25 09:40:32 +0200
commita0c3aae16572bada64c79d0a448190a27260098d (patch)
tree18019198dc8daf997c3038c172222120b750cc1f
parent010d5e11ca20d2d94aea127741fc33b60cf1fe4c (diff)
downloadjsonschema-a0c3aae16572bada64c79d0a448190a27260098d.tar.gz
Fixes validation for uri-template format
-rw-r--r--jsonschema/_format.py13
-rw-r--r--setup.cfg2
2 files changed, 7 insertions, 8 deletions
diff --git a/jsonschema/_format.py b/jsonschema/_format.py
index 6d9be51..27eb4a9 100644
--- a/jsonschema/_format.py
+++ b/jsonschema/_format.py
@@ -412,18 +412,15 @@ else:
try:
- import uritemplate.exceptions
+ import uri_template
except ImportError:
pass
else:
@_checks_drafts(
draft6="uri-template",
draft7="uri-template",
- raises=uritemplate.exceptions.InvalidTemplate,
)
- def is_uri_template(
- instance,
- template_validator=uritemplate.Validator().force_balanced_braces(),
- ):
- template = uritemplate.URITemplate(instance)
- return template_validator.validate(template)
+ def is_uri_template(instance):
+ if not isinstance(instance, str):
+ return True
+ return uri_template.validate(instance)
diff --git a/setup.cfg b/setup.cfg
index b3c04cf..8806726 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -38,6 +38,7 @@ format =
rfc3987
strict-rfc3339
webcolors
+ uri_template
format_nongpl =
fqdn
idna
@@ -45,6 +46,7 @@ format_nongpl =
webcolors
rfc3986-validator>0.1.0
rfc3339-validator
+ uri_template
[options.entry_points]
console_scripts =