MAINT: Deprecations

Author: larsoner

nibabel/__init__.py

@@ -39,7 +39,7 @@
 
 # module imports
 from . import analyze as ana
-from . import ecat, imagestats, mriutils
+from . import ecat, imagestats, mriutils, orientations
 from . import nifti1 as ni1
 from . import spm2analyze as spm2
 from . import spm99analyze as spm99

nibabel/casting.py

@@ -796,3 +796,10 @@ def ulp(val=np.float64(1.0)):
         fl2 = info['minexp']
     # 'nmant' value does not include implicit first bit
     return 2 ** (fl2 - info['nmant'])
+
+
+# Ported from np.compat
+def asstr(s):
+    if isinstance(s, bytes):
+        return s.decode('latin1')
+    return str(s)

nibabel/nicom/utils.py

@@ -1,7 +1,7 @@
 """Utilities for working with DICOM datasets
 """
 
-from numpy.compat.py3k import asstr
+from nibabel.casting import asstr
 
 
 def find_private_section(dcm_data, group_no, creator):

nibabel/nifti1.py

@@ -17,12 +17,11 @@
 
 import numpy as np
 import numpy.linalg as npl
-from numpy.compat.py3k import asstr
 
 from . import analyze  # module import
 from .arrayproxy import get_obj_dtype
 from .batteryrunners import Report
-from .casting import have_binary128
+from .casting import have_binary128, asstr
 from .deprecated import alert_future_error
 from .filebasedimages import ImageFileError, SerializableImage
 from .optpkg import optional_package

nibabel/streamlines/trk.py

@@ -7,9 +7,9 @@
 import warnings
 
 import numpy as np
-from numpy.compat.py3k import asstr
 
 import nibabel as nib
+from nibabel.casting import asstr
 from nibabel.openers import Opener
 from nibabel.orientations import aff2axcodes, axcodes2ornt
 from nibabel.volumeutils import endian_codes, native_code, swapped_code

nibabel/tests/test_openers.py

@@ -17,9 +17,9 @@
 from unittest import mock
 
 import pytest
-from numpy.compat.py3k import asbytes, asstr
 from packaging.version import Version
 
+from ..casting import asstr
 from ..deprecator import ExpiredDeprecationError
 from ..openers import HAVE_INDEXED_GZIP, BZ2File, DeterministicGzipFile, ImageOpener, Opener
 from ..optpkg import optional_package
@@ -342,7 +342,7 @@ def test_iter():
         for input, does_t in files_to_test:
             with Opener(input, 'wb') as fobj:
                 for line in lines:
-                    fobj.write(asbytes(line + os.linesep))
+                    fobj.write(bytes(line + os.linesep, 'ascii'))
             with Opener(input, 'rb') as fobj:
                 for back_line, line in zip(fobj, lines):
                     assert asstr(back_line).rstrip() == line