RF: long -> large, NaN -> nan

Recommendataions by @effigies
- long is a keyword
- numpy.nan is recommended over numpy.NaN

Author: yarikoptic

nibabel/cmdline/diff.py

@@ -50,7 +50,7 @@ def are_values_different(*values):
     Note that comparison is targetting reporting of comparison of the headers
     so has following specifics:
     - even a difference in data types is considered a difference, i.e. 1 != 1.0
-    - NaNs are considered to be the "same", although generally NaN != NaN  
+    - nans are considered to be the "same", although generally nan != nan  
     """
     value0 = values[0]
 
@@ -67,7 +67,7 @@ def are_values_different(*values):
             if value0.dtype != value.dtype or \
                value0.shape != value.shape:
                 return True
-            # there might be NaNs and they need special treatment
+            # there might be nans and they need special treatment
             if value0_nans is not None:
                 value_nans = np.isnan(value)
                 if np.any(value0_nans != value_nans):
@@ -77,8 +77,8 @@ def are_values_different(*values):
                     return True
             elif np.any(value0 != value):
                 return True
-        elif value0 is np.NaN:
-            if value is not np.NaN:
+        elif value0 is np.nan:
+            if value is not np.nan:
                 return True
         elif value0 != value:
             return True

nibabel/tests/test_diff.py

@@ -16,13 +16,13 @@
 
 
 def test_diff_values_int():
-    long = 10**30
+    large = 10**30
     assert not are_values_different(0, 0)
     assert not are_values_different(1, 1)
-    assert not are_values_different(long, long)
+    assert not are_values_different(large, large)
     assert are_values_different(0, 1)
     assert are_values_different(1, 2)
-    assert are_values_different(1, long)
+    assert are_values_different(1, large)
 
 
 def test_diff_values_float():
@@ -44,7 +44,7 @@ def test_diff_values_mixed():
 
 
 def test_diff_values_array():
-    from numpy import NaN, array, inf
+    from numpy import nan, array, inf
     a_int = array([1, 2])
     a_float = a_int.astype(float)
 
@@ -58,16 +58,16 @@ def test_diff_values_array():
     assert not are_values_different(a_int, a_int)
     assert not are_values_different(a_float, a_float)
 
-    # NaNs - we consider them "the same" for the purpose of these comparisons
-    assert not are_values_different(NaN, NaN)
-    assert not are_values_different(NaN, NaN, NaN)
-    assert are_values_different(NaN, NaN, 1)
-    assert are_values_different(1, NaN, NaN)
-    assert not are_values_different(array([NaN, NaN]), array([NaN, NaN]))
-    assert not are_values_different(array([NaN, NaN]), array([NaN, NaN]), array([NaN, NaN]))
-    assert not are_values_different(array([NaN, 1]), array([NaN, 1]))
-    assert are_values_different(array([NaN, NaN]), array([NaN, 1]))
-    assert are_values_different(array([0, NaN]), array([NaN, 0]))
+    # nans - we consider them "the same" for the purpose of these comparisons
+    assert not are_values_different(nan, nan)
+    assert not are_values_different(nan, nan, nan)
+    assert are_values_different(nan, nan, 1)
+    assert are_values_different(1, nan, nan)
+    assert not are_values_different(array([nan, nan]), array([nan, nan]))
+    assert not are_values_different(array([nan, nan]), array([nan, nan]), array([nan, nan]))
+    assert not are_values_different(array([nan, 1]), array([nan, 1]))
+    assert are_values_different(array([nan, nan]), array([nan, 1]))
+    assert are_values_different(array([0, nan]), array([nan, 0]))
     # and some inf should not be a problem
     assert not are_values_different(array([0, inf]), array([0, inf]))
     assert are_values_different(array([0, inf]), array([inf, 0]))