BF - clear up remaining test and doctest failures in python 3

Author: matthew-brett

nibabel/externals/netcdf.py

@@ -117,11 +117,11 @@
 To read the NetCDF file we just created:
 
     >>> f = netcdf_file(fname, 'r')
-    >>> print f.history
-    Created for a test
+    >>> f.history  #2to3: next; bytes
+    'Created for a test'
     >>> time = f.variables['time']
-    >>> print time.units
-    days since 2008-01-01
+    >>> time.units  #2to3: next; bytes
+    'days since 2008-01-01'
     >>> print time.shape
     (10,)
     >>> print time[-1]

nibabel/nicom/csareader.py

@@ -3,7 +3,7 @@
 '''
 import numpy as np
 
-from ..py3k import ZEROB
+from ..py3k import ZEROB, asbytes, asstr
 from .structreader import Unpacker
 
 # DICOM VR code to Python type
@@ -85,7 +85,7 @@ def read(csa_str):
     csa_dict = {'tags': {}}
     hdr_id = csa_str[:4]
     up_str = Unpacker(csa_str, endian='<')
-    if hdr_id == 'SV10': # CSA2
+    if hdr_id == asbytes('SV10'): # CSA2
         hdr_type = 2
         up_str.ptr = 4 # omit the SV10
         csa_dict['unused0'] = up_str.read(4)
@@ -251,4 +251,4 @@ def nt_str(s):
     zero_pos = s.find(ZEROB)
     if zero_pos == -1:
         return s
-    return s[:zero_pos]
+    return asstr(s[:zero_pos])

nibabel/nicom/structreader.py

@@ -14,15 +14,15 @@ class Unpacker(object):
 
     Examples
     --------
-    >>> a = '1234567890' #2to3: here; replace("'1", "b'1")
+    >>> a = '1234567890' #2to3: here; bytes
     >>> upk = Unpacker(a)
-    >>> upk.unpack('2s')
+    >>> upk.unpack('2s') #2to3: next; bytes
     ('12',)
-    >>> upk.unpack('2s')
+    >>> upk.unpack('2s') #2to3: next; bytes
     ('34',)
     >>> upk.ptr
     4
-    >>> upk.read(3)
+    >>> upk.read(3) #2to3: next; bytes
     '567'
     >>> upk.ptr
     7

nibabel/nicom/tests/test_structreader.py

@@ -3,6 +3,7 @@
 import sys
 import struct
 
+from ...py3k import asbytes
 from ..structreader import Unpacker
 
 from nose.tools import (assert_true, assert_false, assert_equal, assert_raises)
@@ -11,9 +12,9 @@
 
 
 def test_unpacker():
-    s = '1234\x00\x01'
-    le_int, = struct.unpack('<h', '\x00\x01')
-    be_int, = struct.unpack('>h', '\x00\x01')
+    s = asbytes('1234\x00\x01')
+    le_int, = struct.unpack('<h', asbytes('\x00\x01'))
+    be_int, = struct.unpack('>h', asbytes('\x00\x01'))
     if sys.byteorder == 'little':
         native_int = le_int
         swapped_int = be_int
@@ -25,12 +26,12 @@ def test_unpacker():
         native_code = '>'
         swapped_code = '<'
     up_str = Unpacker(s, endian='<')
-    assert_equal(up_str.read(4), '1234')
+    assert_equal(up_str.read(4), asbytes('1234'))
     up_str.ptr = 0
-    assert_equal(up_str.unpack('4s'), ('1234',))
+    assert_equal(up_str.unpack('4s'), (asbytes('1234'),))
     assert_equal(up_str.unpack('h'), (le_int,))
     up_str = Unpacker(s, endian='>')
-    assert_equal(up_str.unpack('4s'), ('1234',))
+    assert_equal(up_str.unpack('4s'), (asbytes('1234'),))
     assert_equal(up_str.unpack('h'), (be_int,))
     # now test conflict of endian
     up_str = Unpacker(s, ptr=4, endian='>')
@@ -45,10 +46,10 @@ def test_unpacker():
     assert_equal(up_str.unpack('@h'), (native_int,))
     # test -1 for read
     up_str.ptr = 2
-    assert_equal(up_str.read(), '34\x00\x01')
+    assert_equal(up_str.read(), asbytes('34\x00\x01'))
     # past end
-    assert_equal(up_str.read(), '')
+    assert_equal(up_str.read(), asbytes(''))
     # with n_bytes
     up_str.ptr = 2
-    assert_equal(up_str.read(2), '34')
-    assert_equal(up_str.read(2), '\x00\x01')
+    assert_equal(up_str.read(2), asbytes('34'))
+    assert_equal(up_str.read(2), asbytes('\x00\x01'))

nibabel/nifti1.py

@@ -921,7 +921,8 @@ def get_intent(self, code_repr='label'):
             raise TypeError('repr can be "label" or "code"')
         n_params = len(recoder.parameters[code])
         params = (float(hdr['intent_p%d' % (i+1)]) for i in range(n_params))
-        return label, tuple(params), np.asscalar(hdr['intent_name'])
+        name = asstr(np.asscalar(hdr['intent_name']))
+        return label, tuple(params), name
 
     def set_intent(self, code, params=(), name=''):
         ''' Set the intent code, parameters and name

nibabel/tests/test_data.py

@@ -138,7 +138,7 @@ def test_data_path():
     if USER_KEY in env:
         del os.environ[USER_KEY]
     fake_user_dir = '/user/path'
-    nibd.get_nipy_system_dir = lambda : ''
+    nibd.get_nipy_system_dir = lambda : '/unlikely/path'
     nibd.get_nipy_user_dir = lambda : fake_user_dir
     # now we should only have anything pointed to in the user's dir
     old_pth = get_data_path()

nibabel/tests/test_nifti1.py

@@ -329,13 +329,13 @@ def test_intents():
     ehdr = Nifti1Header()
     ehdr.set_intent('t test', (10,), name='some score')
     assert_equal(ehdr.get_intent(),
-                 ('t test', (10.0,), asbytes('some score')))
+                 ('t test', (10.0,), 'some score'))
     # invalid intent name
     assert_raises(KeyError,
                   ehdr.set_intent, 'no intention')
     # too many parameters
     assert_raises(HeaderDataError,
-                  ehdr.set_intent, 
+                  ehdr.set_intent,
                   't test', (10,10))
     # too few parameters
     assert_raises(HeaderDataError,

nibabel/tmpdirs.py

@@ -17,17 +17,17 @@
 class TemporaryDirectory(object):
     """Create and return a temporary directory.  This has the same
     behavior as mkdtemp but can be used as a context manager.
-    
+
     Upon exiting the context, the directory and everthing contained
     in it are removed.
-    
+
     Examples
     --------
     >>> import os
     >>> with TemporaryDirectory() as tmpdir:
     ...     fname = os.path.join(tmpdir, 'example_file.txt')
     ...     with open(fname, 'wt') as fobj:
-    ...         fobj.write('a string\\n')
+    ...         _ = fobj.write('a string\\n')
     >>> os.path.exists(tmpdir)
     False
     """
@@ -56,7 +56,7 @@ class InTemporaryDirectory(TemporaryDirectory):
     >>> import os
     >>> my_cwd = os.getcwd()
     >>> with InTemporaryDirectory() as tmpdir:
-    ...     open('test.txt', 'wt').write('some text')
+    ...     _ = open('test.txt', 'wt').write('some text')
     ...     assert os.path.isfile('test.txt')
     ...     assert os.path.isfile(os.path.join(tmpdir, 'test.txt'))
     >>> os.path.exists(tmpdir)

nibabel/trackvis.py

@@ -387,7 +387,7 @@ def empty_header(endianness=None, version=2):
     >>> hdr = empty_header()
     >>> print hdr['version']
     2
-    >>> np.asscalar(hdr['id_string']) #2to3: next; line.replace("'T", "b'T")
+    >>> np.asscalar(hdr['id_string']) #2to3: next; bytes
     'TRACK'
     >>> endian_codes[hdr['version'].dtype.byteorder] == native_code
     True

nibabel/volumeutils.py

@@ -395,7 +395,7 @@ def array_from_file(shape, in_dtype, infile, offset=0, order='F'):
     >>> np.all(arr == arr2)
     True
     >>> bio = BytesIO()
-    >>> _ = bio.write(' ' * 10) #2to3: here; replace("' '", "b' '")
+    >>> _ = bio.write(' ' * 10) #2to3: here; bytes
     >>> _ = bio.write(arr.tostring('F'))
     >>> arr2 = array_from_file((1,2,3), arr.dtype, bio, 10)
     >>> np.all(arr == arr2)