python 3 compatibility

AthenaEPI · Feb 19, 2018 · 523ca4e · 523ca4e
1 parent d2f8465
commit 523ca4e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/dmipy/data/saved_acquisition_schemes.py b/dmipy/data/saved_acquisition_schemes.py
@@ -2,11 +2,14 @@
 from os.path import join
 import os
 import pkg_resources
-from urllib import urlopen
 from ..core.acquisition_scheme import (
     acquisition_scheme_from_bvalues,
     acquisition_scheme_from_gradient_strengths,
     acquisition_scheme_from_schemefile)
+try:
+    from urllib2 import urlopen
+except ImportError:
+    from urllib.request import urlopen
 
 _GRADIENT_TABLES_PATH = pkg_resources.resource_filename(
     'dmipy', 'data/gradient_tables'
@@ -83,7 +86,7 @@ def isbi2015_white_matter_challenge_scheme():
 
     response = urlopen(path_schemefile)
     data = response.read()
-    file_ = open(join(isbi_data_path, filename), 'w')
+    file_ = open(join(isbi_data_path, filename), 'wb')
     file_.write(data)
     file_.close()
 

diff --git a/dmipy/data/saved_data.py b/dmipy/data/saved_data.py
@@ -1,12 +1,17 @@
 from os.path import join
 import os
-from urllib import urlopen
 import pkg_resources
 import nibabel as nib
 import numpy as np
 from scipy.stats import pearsonr
 import matplotlib.pyplot as plt
 from . import saved_acquisition_schemes
+
+try:
+    from urllib2 import urlopen
+except ImportError:
+    from urllib.request import urlopen
+
 DATA_PATH = pkg_resources.resource_filename(
     'dmipy', 'data'
 )
@@ -167,7 +172,7 @@ def isbi2015_white_matter_challenge():
     for filename, path in zip(filenames, paths):
         response = urlopen(path)
         data = response.read()
-        file_ = open(join(isbi_data_path, filename), 'w')
+        file_ = open(join(isbi_data_path, filename), 'wb')
         file_.write(data)
         file_.close()