RF - refactored 2 to 3 doctest markup with more comprehensive tests

Author: matthew-brett

nibabel/analyze.py

@@ -395,9 +395,9 @@ def from_fileobj(klass, fileobj, endianness=None, check=True):
 
         Examples
         --------
-        >>> from StringIO import StringIO as BytesIO
+        >>> from StringIO import StringIO #23dt : BytesIO
         >>> hdr = AnalyzeHeader()
-        >>> fileobj = BytesIO(hdr.binaryblock)
+        >>> fileobj = StringIO(hdr.binaryblock) #23dt : BytesIO
         >>> _ = fileobj.seek(0) # returns 0 in python 3
         >>> hdr2 = AnalyzeHeader.from_fileobj(fileobj)
         >>> hdr2.binaryblock == hdr.binaryblock
@@ -445,8 +445,8 @@ def write_to(self, fileobj):
         Examples
         --------
         >>> hdr = AnalyzeHeader()
-        >>> from StringIO import StringIO as BytesIO
-        >>> str_io = BytesIO()
+        >>> from StringIO import StringIO #23dt : BytesIO
+        >>> str_io = StringIO() #23dt : BytesIO
         >>> hdr.write_to(str_io)
         >>> hdr.binaryblock == str_io.getvalue()
         True
@@ -612,8 +612,8 @@ def data_to_fileobj(self, data, fileobj):
         >>> hdr = AnalyzeHeader()
         >>> hdr.set_data_shape((1, 2, 3))
         >>> hdr.set_data_dtype(np.float64)
-        >>> from StringIO import StringIO as BytesIO
-        >>> str_io = BytesIO()
+        >>> from StringIO import StringIO #23dt : BytesIO
+        >>> str_io = StringIO() #23dt : BytesIO
         >>> data = np.arange(6).reshape(1,2,3)
         >>> hdr.data_to_fileobj(data, str_io)
         >>> data.astype(np.float64).tostring('F') == str_io.getvalue()
@@ -655,7 +655,7 @@ def __setitem__(self, item, value):
         --------
         >>> hdr = AnalyzeHeader()
         >>> hdr['descrip'] = 'description'
-        >>> np.asscalar(hdr['descrip']) #2to3: next; replace("'d", "b'd")
+        >>> np.asscalar(hdr['descrip']) #23dt next : bytes
         'description'
         '''
         self._header_data[item] = value

nibabel/externals/netcdf.py

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

nibabel/nicom/structreader.py

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

nibabel/spatialimages.py

@@ -103,10 +103,10 @@
 work:
 
    >>> # write an image to files
-   >>> from StringIO import StringIO as BytesIO
+   >>> from StringIO import StringIO #23dt : BytesIO
    >>> file_map = nib.AnalyzeImage.make_file_map()
-   >>> file_map['image'].fileobj = BytesIO()
-   >>> file_map['header'].fileobj = BytesIO()
+   >>> file_map['image'].fileobj = StringIO() #23dt : BytesIO
+   >>> file_map['header'].fileobj = StringIO() #23dt : BytesIO
    >>> img = nib.AnalyzeImage(data, np.eye(4))
    >>> img.file_map = file_map
    >>> img.to_file_map()

nibabel/trackvis.py

@@ -237,8 +237,8 @@ def write(fileobj, streamlines,  hdr_mapping=None, endianness=None):
 
     Examples
     --------
-    >>> from StringIO import StringIO as BytesIO
-    >>> file_obj = BytesIO()
+    >>> from StringIO import StringIO #23dt : BytesIO
+    >>> file_obj = StringIO() #23dt : BytesIO
     >>> pts0 = np.random.uniform(size=(10,3))
     >>> pts1 = np.random.uniform(size=(10,3))
     >>> streamlines = ([(pts0, None, None), (pts1, None, None)])
@@ -251,7 +251,7 @@ def write(fileobj, streamlines,  hdr_mapping=None, endianness=None):
     If there are too many streamlines to fit in memory, you can pass an iterable
     thing instead of a list
 
-    >>> file_obj = BytesIO()
+    >>> file_obj = StringIO() #23dt : BytesIO
     >>> def gen():
     ...     yield (pts0, None, None)
     ...     yield (pts0, None, None)
@@ -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; bytes
+    >>> np.asscalar(hdr['id_string']) #23dt next : bytes
     'TRACK'
     >>> endian_codes[hdr['version'].dtype.byteorder] == native_code
     True

nibabel/volumeutils.py

@@ -387,15 +387,15 @@ def array_from_file(shape, in_dtype, infile, offset=0, order='F'):
 
     Examples
     --------
-    >>> from StringIO import StringIO as BytesIO
-    >>> bio = BytesIO()
+    >>> from StringIO import StringIO #23dt : BytesIO
+    >>> bio = StringIO() #23dt : BytesIO
     >>> arr = np.arange(6).reshape(1,2,3)
     >>> _ = bio.write(arr.tostring('F')) # outputs int in python3
     >>> arr2 = array_from_file((1,2,3), arr.dtype, bio)
     >>> np.all(arr == arr2)
     True
-    >>> bio = BytesIO()
-    >>> _ = bio.write(' ' * 10) #2to3: here; bytes
+    >>> bio = StringIO() #23dt : BytesIO
+    >>> _ = bio.write(' ' * 10) #23dt : bytes
     >>> _ = bio.write(arr.tostring('F'))
     >>> arr2 = array_from_file((1,2,3), arr.dtype, bio, 10)
     >>> np.all(arr == arr2)
@@ -485,8 +485,8 @@ def array_to_file(data, fileobj, out_dtype=None, offset=0,
 
     Examples
     --------
-    >>> from StringIO import StringIO as BytesIO
-    >>> sio = BytesIO()
+    >>> from StringIO import StringIO #23dt : BytesIO
+    >>> sio = StringIO() #23dt : BytesIO
     >>> data = np.arange(10, dtype=np.float)
     >>> array_to_file(data, sio, np.float)
     >>> sio.getvalue() == data.tostring('F')
@@ -869,7 +869,7 @@ def rec2dict(rec):
     --------
     >>> r = np.zeros((), dtype = [('x', 'i4'), ('s', 'S10')])
     >>> d = rec2dict(r)
-    >>> d == {'x': 0, 's': ''} #2to3: here; replace("''", "b''")
+    >>> d == {'x': 0, 's': ''} #23dt : replace("''", "b''")
     True
     '''
     dct = {}