summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne@peacefrogs.net>2019-12-02 11:29:29 +0100
committerÉtienne Loks <etienne@peacefrogs.net>2019-12-02 11:29:29 +0100
commit4d6d85e3f5dbf2a3c8a60bb01b07a591ca08b61d (patch)
tree267c59d230427e4f814949e00e2696a8e4602fdc
parent90214da2848e3ccb0a3083dffd9362ca5806ca69 (diff)
downloadishtar-pergamon-4d6d85e3f5dbf2a3c8a60bb01b07a591ca08b61d.tar.bz2
ishtar-pergamon-4d6d85e3f5dbf2a3c8a60bb01b07a591ca08b61d.zip
Upgrade requirements
-rw-r--r--requirements.txt2
-rw-r--r--showcase/models.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/requirements.txt b/requirements.txt
index 02df263..4943264 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
unidecode
Django>=2.2,<2.3
-wagtail>=2.5,<2.6
+wagtail>=2.7,<2.8
requests==2.12
python-memcached==1.59
diff --git a/showcase/models.py b/showcase/models.py
index 572d295..7f2d423 100644
--- a/showcase/models.py
+++ b/showcase/models.py
@@ -71,6 +71,8 @@ class ExternalSource(models.Model):
data = json.loads(response.text)
cache.set(key, data)
self.error = ""
+ except json.JSONDecodeError:
+ self.error = base_error + str(_("invalid source"))
except requests.exceptions.Timeout:
self.error = base_error + str(_("connection time out"))
except requests.exceptions.TooManyRedirects: