Merge pull request #397 from loris-imageserver/py3

fix some import issues with python 3

Author: alexwlchan

loris/authorizer.py

@@ -3,12 +3,15 @@
 `authorizer` -- Handle authorization of access to content
 =========================================================
 """
+from __future__ import absolute_import
 
 from logging import getLogger
-from loris_exception import AuthorizerException, ConfigError
 import requests
 
-from urlparse import urlparse
+try:
+    from urllib.parse import urlparse
+except ImportError:  # Python 2
+    from urlparse import urlparse
 
 import jwt
 
@@ -19,6 +22,7 @@
 from cryptography.hazmat.primitives import hashes
 from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC
 
+from .loris_exception import AuthorizerException, ConfigError
 
 logger = getLogger(__name__)
 

loris/webapp.py

@@ -16,7 +16,10 @@
 import re
 from subprocess import CalledProcessError
 from tempfile import NamedTemporaryFile
-from urllib import unquote, quote_plus
+try:
+    from urllib.parse import unquote, quote_plus
+except ImportError:  # Python 2
+    from urllib import unquote, quote_plus
 
 import sys
 sys.path.append('.')

tests/webapp_t.py

@@ -306,7 +306,6 @@ def test_access_control_allow_origin_on_bare_identifier(self):
     def test_access_control_allow_origin_on_info_requests(self):
         uri = '/%s/info.json' % (self.test_jp2_color_id,)
         resp = self.client.get(uri)
-        print resp.headers['access-control-allow-origin']
         self.assertEqual(resp.headers['access-control-allow-origin'], '*')
 
     def test_access_control_allow_origin_on_img_request(self):