properly fix, more py3 compat

Author: gijzelaerr

test/test_client_util.py

@@ -64,8 +64,8 @@ def testSupportedFormatChecking(self):
         for file_format, location in self.local.items():
             if file_format != 'unsupported':
                 # Tests the behavior after receiving supported file types with and without the 'file://' prefix
-                self.assertEquals(wf_info(location), self.expected[file_format])
-                self.assertEquals(wf_info(location[7:]), self.expected[file_format])
+                self.assertEqual(wf_info(location), self.expected[file_format])
+                self.assertEqual(wf_info(location[7:]), self.expected[file_format])
 
             else:
                 # Tests behavior after receiving a non supported file type.
@@ -91,7 +91,7 @@ def testFileLocationChecking(self):
                     wf_info(location)
 
             else:
-                self.assertEquals(wf_info(location), self.expected[file_format])
+                self.assertEqual(wf_info(location), self.expected[file_format])
                 self.assertFalse(os.path.isfile(os.path.join(os.getcwd(), 'fetchedFromRemote.' + file_format)))
 
 

wes_client/util.py

@@ -5,15 +5,14 @@
 import yaml
 import glob
 import requests
-import urllib
 import logging
 
 from wes_service.util import visit
 
 from future.standard_library import hooks
 
 with hooks():
-    from urllib.request import pathname2url
+    from urllib.request import urlopen, pathname2url
 
 
 def two_seven_compatible(filePath):
@@ -60,7 +59,7 @@ def wf_info(workflow_path):
             html = urlopen(workflow_path).read()
             local_loc = os.path.join(os.getcwd(), 'fetchedFromRemote.' + file_type)
             with open(local_loc, 'w') as f:
-                f.write(html)
+                f.write(html.decode())
             version = wf_info('file://' + local_loc)[0]  # Don't take the file_type here, found it above.
             os.remove(local_loc)  # TODO: Find a way to avoid recreating file before version determination.
         else:
@@ -90,7 +89,7 @@ def fixpaths(d):
             if "path" in d:
                 if ":" not in d["path"]:
                     local_path = os.path.normpath(os.path.join(os.getcwd(), basedir, d["path"]))
-                    d["location"] = urllib.pathname2url(local_path)
+                    d["location"] = pathname2url(local_path)
                 else:
                     d["location"] = d["path"]
                 del d["path"]