Merge 0aa879d into 128b7d6

IIIF · Mar 10, 2020 · 44db4ca · 44db4ca
2 parents 128b7d6 + 0aa879d
commit 44db4ca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/iiif-presentation-validator.py b/iiif-presentation-validator.py
@@ -42,7 +42,7 @@ def fetch(self, url):
         try:
             wh = urlopen(req)
         except HTTPError as wh:
-            pass
+            raise wh
         data = wh.read()
         wh.close()
 
@@ -53,7 +53,7 @@ def fetch(self, url):
         try:
             data = data.decode('utf-8')
         except:
-            pass
+            raise
         return(data, wh)
 
     def check_manifest(self, data, version, url=None, warnings=[]):
@@ -113,8 +113,8 @@ def do_GET_test(self):
 
         try:
             (data, webhandle) = self.fetch(url)
-        except:
-            return self.return_json({'okay': 0, 'error': 'Cannot fetch url', 'url': url})
+        except Exception as error:
+            return self.return_json({'okay': 0, 'error': 'Cannot fetch url. Got "{}"'.format(error), 'url': url})
 
         # First check HTTP level
         ct = webhandle.headers.get('content-type', '')

diff --git a/tests/test_validator.py b/tests/test_validator.py
@@ -107,7 +107,7 @@ def test05_do_GET_test(self):
         v.fetch.side_effect = Exception('Fetch failed')
         j = json.loads(v.do_GET_test())
         self.assertEqual(j['okay'], 0)
-        self.assertEqual(j['error'], 'Cannot fetch url')
+        self.assertTrue(j['error'].startswith('Cannot fetch url'))
         # bogus URL
         v = val_mod.Validator()
         request = LocalRequest({'QUERY_STRING': 'url=not_http://a.b.c/'})