fix: cleanup needed for integration tests on py35 (#653)

Author: jsam

renku/cli/_providers/dataverse.py

@@ -106,11 +106,11 @@ class DataverseProvider(ProviderApi):
     def supports(uri):
         """Whether or not this provider supports a given uri."""
         is_doi_ = is_doi(uri)
-        if (is_doi_ is None and check_dataverse_uri(uri)) or \
-                check_dataverse_doi(is_doi_.group(0)):
-            return True
 
-        return False
+        is_dataverse_uri = is_doi_ is None and check_dataverse_uri(uri)
+        is_dataverse_doi = is_doi_ and check_dataverse_doi(is_doi_.group(0))
+
+        return is_dataverse_uri or is_dataverse_doi
 
     @staticmethod
     def record_id(uri):

renku/cli/dataset.py

@@ -624,8 +624,8 @@ def _init(lock, id_queue):
 
         try:
             for p in processing:
-                p.wait()
-                p.get()
+                p.get()  # Will internally do the wait() as well.
+
         except HTTPError as e:
             raise BadParameter((
                 'Could not process {0}.\n'
@@ -661,7 +661,7 @@ def extract_dataset(data_folder_, filename):
 
     def stream_to_file(request):
         """Stream bytes to file."""
-        with open(download_to, 'wb') as f_:
+        with open(str(download_to), 'wb') as f_:
             scaling_factor = 1e-6
             unit = 'MB'
 

renku/utils/doi.py

@@ -34,7 +34,5 @@ def extract_doi(uri):
     """Return the DOI in a string if there is one."""
     match = doi_regexp.match(uri)
 
-    if match is None:
-        return None
-
-    return match.group(2)
+    if match:
+        return match.group(2)