FIX: Maybe

Author: larsoner

nibabel/casting.py

@@ -495,6 +495,7 @@ def int_to_float(val, flt_type):
     # -1
     if not isinstance(val, Integral):
         val = int(str(val))
+    val = int(val)
     faval = np.longdouble(0)
     while val != 0:
         f64 = np.float64(val)

nibabel/nifti1.py

@@ -2443,15 +2443,11 @@ def _get_analyze_compat_dtype(arr):
         return np.dtype('int16' if arr.max() <= np.iinfo(np.int16).max else 'int32')
 
     mn, mx = arr.min(), arr.max()
-    if np.can_cast(mn, np.int32) and np.can_cast(mx, np.int32):
-        return np.dtype('int32')
-    if np.can_cast(mn, np.float32) and np.can_cast(mx, np.float32):
-        return np.dtype('float32')
-    if isinstance(mn, int) and isinstance(mx, int):
-        info = np.finfo('int32')
+    if arr.dtype.kind == 'i':
+        info = np.iinfo('int32')
         if mn >= info.min and mx <= info.max:
             return np.dtype('int32')
-    if isinstance(mn, float) and isinstance(mx, float):
+    elif arr.dtype.kind == 'f':
         info = np.finfo('float32')
         if mn >= info.min and mx <= info.max:
             return np.dtype('float32')

nibabel/testing/__init__.py

@@ -82,7 +82,7 @@ def assert_allclose_safely(a, b, match_nans=True, rtol=1e-5, atol=1e-8):
         a = a.astype(float)
     if b.dtype.kind in 'ui':
         b = b.astype(float)
-    assert np.allclose(a, b, rtol=rtol, atol=atol)
+    np.testing.assert_allclose(a, b, rtol=rtol, atol=atol)
 
 
 def assert_arrays_equal(arrays1, arrays2):