First changes so datarray imports on Python 3. Tests don't pass yet.

BIDS · Sep 20, 2015 · 3157308 · 3157308
1 parent cc6495f
commit 3157308
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/datarray/__init__.py b/datarray/__init__.py
@@ -16,7 +16,7 @@
 try:
     from .testing.testlib import test
 except ImportError:
-    print "No datarray unit testing available."
+    print("No datarray unit testing available.")
 
 from .version import __version__
 from .datarray import DataArray
diff --git a/datarray/datarray.py b/datarray/datarray.py
@@ -984,7 +984,7 @@ def __getitem__(self, key):
             # Pop the axes off in descending order to prevent index renumbering
             # headaches 
             reductions = reversed(sorted(zip(key, new_axes), None, 
-                key=lambda (k,ax): ax.index))
+                key=lambda k,ax: ax.index))
             arr = self
             for k,ax in reductions:
                 arr = arr.axes[ax.index][k]

diff --git a/datarray/testing/__init__.py b/datarray/testing/__init__.py
@@ -1,2 +1,2 @@
 
-from utils import *
+from .utils import *
diff --git a/datarray/testing/utils.py b/datarray/testing/utils.py
@@ -101,23 +101,23 @@ def heading(text):
         # Both x and y are scalars        
         try:
             assert_equal(x, y)
-        except AssertionError, err:
+        except (AssertionError, err):
             fail.append(heading('SCALARS') + str(err))
 
     elif (type(x) is np.ndarray) and (type(y) is np.ndarray):
 
         # Both x and y are scalars       
         try:
             assert_array_equal(x, y)
-        except AssertionError, err:
+        except (AssertionError, err):
             fail.append(heading('ARRAYS') + str(err))            
 
     elif (type(x) == DataArray) + (type(y) == DataArray) == 1:
 
         # Only one of x and y are datarrays; test failed
         try: 
             assert_equal(type(x), type(y))
-        except AssertionError, err:
+        except (AssertionError, err):
             fail.append(heading('TYPE') + str(err))
 
     else:
@@ -127,35 +127,35 @@ def heading(text):
         # shape
         try:         
             assert_equal(x.shape, y.shape)
-        except AssertionError, err:
+        except (AssertionError, err):
             fail.append(heading('SHAPE') + str(err))       
 
         # axis names
         try:         
             assert_equal(x.names, y.names)
-        except AssertionError, err:
+        except (AssertionError, err):
             fail.append(heading('AXIS NAMES') + str(err))
 
         # labels
         for ax in range(x.ndim):
-            try:         
+            try:
                 assert_equal(x.axes[ax].labels, y.axes[ax].labels)
-            except AssertionError, err:
+            except (AssertionError, err):
                 fail.append(heading('LABELS ALONG AXIS = %d' % ax) + str(err))                         
 
         # axes
         for ax in range(x.ndim):
             try:         
                 assert_(x.axes[ax], y.axes[ax])
-            except AssertionError, err:
+            except (AssertionError, err):
                 fail.append(heading('AXIS OBJECT ALONG AXIS = %d' % ax) + str(err))
                 fail.append('x: ' + str(x.axes[ax]))
                 fail.append('y: ' + str(y.axes[ax]))
 
         # data
         try:         
             assert_array_equal(x.base, y.base)
-        except AssertionError, err:
+        except (AssertionError, err):
             fail.append(heading('ARRAY') + str(err))                
 
     # Did the test pass?    
@@ -168,7 +168,7 @@ def heading(text):
                 err_msg = heading("TEST: " + err_msg) + err_msgs
             else:
                 err_msg = err_msgs           
-            raise AssertionError, err_msg
+            raise (AssertionError, err_msg)
         else:
             raise AssertionError