RF: Import from numpy.compat.py3k when needed

Author: effigies

nibabel/cmdline/utils.py

@@ -18,8 +18,6 @@
 
 import numpy as np
 
-from nibabel.py3k import asunicode
-
 verbose_level = 0
 
 
@@ -100,7 +98,7 @@ def table2string(table, out=None):
             string_ += "%%%ds%%s%%%ds " \
                        % (nspacesl, nspacesr) % ('', item, '')
         string += string_.rstrip() + '\n'
-    out.write(asunicode(string))
+    out.write(string)
 
     if print2string:
         value = out.getvalue()

nibabel/externals/netcdf.py

@@ -35,7 +35,7 @@
 from mmap import mmap, ACCESS_READ
 
 import numpy as np  # noqa
-from ..py3k import asbytes, asstr
+from numpy.compat.py3k import asbytes, asstr
 from numpy import frombuffer, ndarray, dtype, empty, array, asarray
 from numpy import little_endian as LITTLE_ENDIAN
 from functools import reduce

nibabel/nicom/utils.py

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

nibabel/nifti1.py

@@ -15,8 +15,8 @@
 
 import numpy as np
 import numpy.linalg as npl
+from numpy.compat.py3k import asstr
 
-from .py3k import asstr
 from .filebasedimages import SerializableImage
 from .volumeutils import Recoder, make_dt_codes, endian_codes
 from .spatialimages import HeaderDataError, ImageFileError

nibabel/py3k.py

@@ -1,88 +1,9 @@
-"""
-Python 3 compatibility tools.
+import warnings
 
-Copied from numpy/compat/py3k.
+warnings.warn("We no longer carry a copy of the 'py3k' module in nibabel; "
+              "Please import from the 'numpy.compat.py3k' module directly. "
+              "Full removal scheduled for nibabel 4.0.",
+              FutureWarning,
+              stacklevel=2)
 
-Please prefer the routines in the six module when possible.
-
-BSD license
-"""
-
-__all__ = ['bytes', 'asbytes', 'isfileobj', 'getexception', 'strchar',
-           'unicode', 'asunicode', 'asbytes_nested', 'asunicode_nested',
-           'asstr', 'open_latin1', 'StringIO', 'BytesIO']
-
-import sys
-
-if sys.version_info[0] >= 3:
-    import io
-    StringIO = io.StringIO
-    BytesIO = io.BytesIO
-    bytes = bytes
-    unicode = str
-    asunicode = str
-
-    def asbytes(s):
-        if isinstance(s, bytes):
-            return s
-        return s.encode('latin1')
-
-    def asstr(s):
-        if isinstance(s, str):
-            return s
-        return s.decode('latin1')
-
-    def isfileobj(f):
-        return isinstance(f, io.FileIO)
-
-    def open_latin1(filename, mode='r'):
-        return open(filename, mode=mode, encoding='iso-8859-1')
-    strchar = 'U'
-    ints2bytes = lambda seq: bytes(seq)
-    ZEROB = bytes([0])
-    FileNotFoundError = FileNotFoundError
-    import builtins
-else:
-    import StringIO
-    StringIO = BytesIO = StringIO.StringIO
-    bytes = str
-    unicode = unicode
-    asbytes = str
-    asstr = str
-    strchar = 'S'
-
-    def isfileobj(f):
-        return isinstance(f, file)
-
-    def asunicode(s):
-        if isinstance(s, unicode):
-            return s
-        return s.decode('ascii')
-
-    def open_latin1(filename, mode='r'):
-        return open(filename, mode=mode)
-    ints2bytes = lambda seq: ''.join(chr(i) for i in seq)
-    ZEROB = chr(0)
-
-    class FileNotFoundError(IOError):
-        pass
-
-    import __builtin__ as builtins  # noqa
-
-
-def getexception():
-    return sys.exc_info()[1]
-
-
-def asbytes_nested(x):
-    if hasattr(x, '__iter__') and not isinstance(x, (bytes, unicode)):
-        return [asbytes_nested(y) for y in x]
-    else:
-        return asbytes(x)
-
-
-def asunicode_nested(x):
-    if hasattr(x, '__iter__') and not isinstance(x, (bytes, unicode)):
-        return [asunicode_nested(y) for y in x]
-    else:
-        return asunicode(x)
+from numpy.compat.py3k import *  # noqa

nibabel/streamlines/tck.py

@@ -8,9 +8,9 @@
 import warnings
 
 import numpy as np
+from numpy.compat.py3k import asbytes, asstr
 
 from nibabel.openers import Opener
-from nibabel.py3k import asbytes, asstr
 
 from .array_sequence import ArraySequence
 from .tractogram_file import TractogramFile

nibabel/streamlines/tests/test_streamlines.py

@@ -8,7 +8,7 @@
 import nibabel as nib
 from io import BytesIO
 from nibabel.tmpdirs import InTemporaryDirectory
-from nibabel.py3k import asbytes
+from numpy.compat.py3k import asbytes
 
 from nibabel.testing import data_path
 from nibabel.testing import clear_and_catch_warnings

nibabel/streamlines/trk.py

@@ -8,10 +8,11 @@
 import warnings
 
 import numpy as np
+from numpy.compat.py3k import asstr
+
 import nibabel as nib
 
 from nibabel.openers import Opener
-from nibabel.py3k import asstr
 from nibabel.volumeutils import (native_code, swapped_code, endian_codes)
 from nibabel.orientations import (aff2axcodes, axcodes2ornt)
 

nibabel/tests/test_openers.py

@@ -13,7 +13,7 @@
 from io import BytesIO, UnsupportedOperation
 from distutils.version import StrictVersion
 
-from ..py3k import asstr, asbytes
+from numpy.compat.py3k import asstr, asbytes
 from ..openers import Opener, ImageOpener, HAVE_INDEXED_GZIP, BZ2File
 from ..tmpdirs import InTemporaryDirectory
 from ..volumeutils import BinOpener

nibabel/tests/test_optpkg.py

@@ -4,14 +4,14 @@
 import mock
 import types
 import sys
+import builtins
 from distutils.version import LooseVersion
 
 from nose import SkipTest
 from nose.tools import (assert_true, assert_false, assert_raises,
                         assert_equal)
 
 
-from nibabel.py3k import builtins
 from nibabel.optpkg import optional_package
 from nibabel.tripwire import TripWire, TripWireError