Merge 9570e88 into 4a7edaf

IIIF · Aug 20, 2019 · d61a144 · d61a144
2 parents 4a7edaf + 9570e88
commit d61a144
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/iiif_validator/tests/baseurl_redirect.py b/iiif_validator/tests/baseurl_redirect.py
@@ -2,9 +2,11 @@
 try:
     # python3
     from urllib.request import Request, urlopen, HTTPError
+    print ('Importing 3')
 except ImportError:
     # fall back to python2
     from urllib2 import Request, urlopen, HTTPError
+    print ('Importing 2')
 
 
 class Test_Baseurl_Redirect(BaseTest):
@@ -17,16 +19,24 @@ class Test_Baseurl_Redirect(BaseTest):
     def run(self, result):
         url = result.make_info_url()
         url = url.replace('/info.json', '')
+        newurl = ''
         try:
             r = Request(url)
             wh = urlopen(r)
             img = wh.read()   
             wh.close()
+            newurl = wh.geturl()
         except HTTPError as e:
             wh = e        
+            if wh.getcode() >= 300 and wh.getcode() < 400:
+                newurl = wh.headers['Location']
+            else:
+                newurl = wh.geturl()
 
-        u = wh.geturl()
-        if u == url:
+        if newurl == url:
+            print (wh)
+            print (wh.geturl())
+            print (type(wh))
             # we didn't redirect
             raise ValidatorError('redirect', u, '{}/info.json'.format(url), result, 'Failed to redirect from {} to {}/info.json. Response code {}'.format(u, url, wh.getcode()))
         else: