aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pessotto <melmothx@gmail.com>2021-08-20 09:55:14 +1000
committerBen Sturmfels <ben@sturm.com.au>2021-08-20 09:59:03 +1000
commitc6ec71b6de0afd12c5ea6baefd3d668b112ade3c (patch)
tree40028eb4d423e49aebcaf665e9e58ec01bddd948
parent1b55d25fec13afd78bf53a5e3d6340b8ab6ecbc0 (diff)
downloadmediagoblin-c6ec71b6de0afd12c5ea6baefd3d668b112ade3c.tar.lz
mediagoblin-c6ec71b6de0afd12c5ea6baefd3d668b112ade3c.tar.xz
mediagoblin-c6ec71b6de0afd12c5ea6baefd3d668b112ade3c.zip
Remove reference to jsonschema.compat now removed upstream.
Signed-off-by: Ben Sturmfels <ben@sturm.com.au>
-rw-r--r--AUTHORS1
-rw-r--r--docs/source/siteadmin/relnotes.rst1
-rw-r--r--mediagoblin/tools/metadata.py5
3 files changed, 4 insertions, 3 deletions
diff --git a/AUTHORS b/AUTHORS
index eb11d4ce..1bf78364 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -82,6 +82,7 @@ Thank you!
* Luke Slater
* Manuel Urbano Santos
* Marcel van der Boom
+* Marco Pessotto
* Mark Holmquist
* Mats Sjöberg
* Matt Lee
diff --git a/docs/source/siteadmin/relnotes.rst b/docs/source/siteadmin/relnotes.rst
index 1577068a..37fe3f7b 100644
--- a/docs/source/siteadmin/relnotes.rst
+++ b/docs/source/siteadmin/relnotes.rst
@@ -48,6 +48,7 @@ This chapter has important information about our current and previous releases.
**Bug fixes:**
- Fix test suite on Debian 11 (Ben Sturmfels)
+- Remove reference to jsonschema.compat no longer available upstream (Marco Pessotto)
0.11.0
diff --git a/mediagoblin/tools/metadata.py b/mediagoblin/tools/metadata.py
index 5e5ad9fd..0f0a5225 100644
--- a/mediagoblin/tools/metadata.py
+++ b/mediagoblin/tools/metadata.py
@@ -24,7 +24,6 @@ from pkg_resources import resource_filename
import dateutil.parser
from pyld import jsonld
from jsonschema import validate, FormatChecker, draft4_format_checker
-from jsonschema.compat import str_types
from mediagoblin.tools.pluginapi import hook_handle
@@ -42,7 +41,7 @@ def is_uri(instance):
"""
jsonschema uri validator
"""
- if not isinstance(instance, str_types):
+ if not isinstance(instance, str):
return True
return URL_REGEX.match(instance)
@@ -51,7 +50,7 @@ def is_datetime(instance):
"""
Is a date or datetime readable string.
"""
- if not isinstance(instance, str_types):
+ if not isinstance(instance, str):
return True
return dateutil.parser.parse(instance)