Skip to content

Commit 0287da9

Browse files
authored
Merge pull request #819 from anexia-it/uri-template
Fixes validation for uri-template format
2 parents 9698802 + a0c3aae commit 0287da9

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

jsonschema/_format.py

+5-8
Original file line numberDiff line numberDiff line change
@@ -412,18 +412,15 @@ def is_relative_json_pointer(instance):
412412

413413

414414
try:
415-
import uritemplate.exceptions
415+
import uri_template
416416
except ImportError:
417417
pass
418418
else:
419419
@_checks_drafts(
420420
draft6="uri-template",
421421
draft7="uri-template",
422-
raises=uritemplate.exceptions.InvalidTemplate,
423422
)
424-
def is_uri_template(
425-
instance,
426-
template_validator=uritemplate.Validator().force_balanced_braces(),
427-
):
428-
template = uritemplate.URITemplate(instance)
429-
return template_validator.validate(template)
423+
def is_uri_template(instance):
424+
if not isinstance(instance, str):
425+
return True
426+
return uri_template.validate(instance)

setup.cfg

+2
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,15 @@ format =
3838
rfc3987
3939
strict-rfc3339
4040
webcolors
41+
uri_template
4142
format_nongpl =
4243
fqdn
4344
idna
4445
jsonpointer>1.13
4546
webcolors
4647
rfc3986-validator>0.1.0
4748
rfc3339-validator
49+
uri_template
4850

4951
[options.entry_points]
5052
console_scripts =

0 commit comments

Comments
 (0)