fix urllib imports

Author: alimuldal

bioformats/formatreader.py

@@ -32,8 +32,15 @@
 import numpy as np
 import os
 import sys
-import urllib
-import urllib2
+
+if sys.version_info.major == 3:
+    from urllib.request import urlopen, urlparse, url2pathname
+    from urllib.parse import unquote
+else:
+    from urllib import url2pathname
+    from urllib2 import urlopen, urlparse, unquote
+    urlparse = urlparse.urlparse
+
 import shutil
 import tempfile
 import traceback
@@ -546,7 +553,7 @@ def __init__(self, path=None, url=None, perform_init=True):
         self.url = url
         self.using_temp_file = False
         if url is not None and url.lower().startswith(file_scheme):
-            utf8_url = urllib.url2pathname(url[len(file_scheme):])
+            utf8_url = url2pathname(url[len(file_scheme):])
             if isinstance(utf8_url, str):
                 path = str(utf8_url, 'utf-8')
             else:
@@ -593,7 +600,7 @@ def __init__(self, path=None, url=None, perform_init=True):
                 # Other URLS, copy them to a tempfile location
                 #
                 ext = url[url.rfind("."):]
-                src = urllib2.urlopen(url)
+                src = urlopen(url)
                 dest_fd, self.path = tempfile.mkstemp(suffix=ext)
                 try:
                     dest = os.fdopen(dest_fd, 'wb')
@@ -605,8 +612,8 @@ def __init__(self, path=None, url=None, perform_init=True):
                 self.using_temp_file = True
                 src.close()
                 dest.close()
-                urlpath = urllib2.urlparse.urlparse(url)[2]
-                filename = urllib2.unquote(urlpath.split("/")[-1])
+                urlpath = urlparse(url)[2]
+                filename = unquote(urlpath.split("/")[-1])
         else:
             if sys.platform.startswith("win"):
                 self.path = self.path.replace("/", os.path.sep)

bioformats/tests/test_load_using_bioformats.py

@@ -16,7 +16,12 @@
 import bioformats.formatreader as formatreader
 import bioformats.metadatatools as metadatatools
 from bioformats import load_image, load_image_url
-import urllib
+
+import sys
+if sys.version_info.major == 3:
+    from urllib.request import pathname2url
+else:
+    from urllib import pathname2url
 
 class TestLoadUsingBioformats(unittest.TestCase):
 
@@ -48,7 +53,7 @@ def tearDown(self):
 
     def test_01_01_open_file(self):
         path = os.path.join(os.path.dirname(__file__), 'Channel1-01-A-01.tif')
-        url = "file:" + urllib.pathname2url(path).encode("utf-8")
+        url = "file:" + pathname2url(path).encode("utf-8")
         image, scale = load_image_url(
             url, rescale=False, wants_max_intensity=True)
         self.assertEqual(image.shape[0], 640)
@@ -66,7 +71,7 @@ def test_01_03_unicode_url(self):
         # raise an exception when converting URL to string
         #
         path = os.path.join(os.path.dirname(__file__), 'Channel1-01-A-01.tif')
-        url = "file:" + urllib.pathname2url(path).encode("utf-8")
+        url = "file:" + pathname2url(path).encode("utf-8")
         image, scale = load_image_url(
             url, rescale=False, wants_max_intensity=True)
         self.assertEqual(image.shape[0], 640)