DOC: Update docstrings without Py2/3 discussion

Author: effigies

nibabel/fileutils.py

@@ -23,9 +23,8 @@ def read_zt_byte_strings(fobj, n_strings=1, bufsize=1024):
     Parameters
     ----------
     f : fileobj
-        File object to use.  Should implement ``read``, returning byte objects
-        (str in Python 2), and ``seek(n, 1)`` to seek from current file
-        position.
+        File object to use.  Should implement ``read``, returning byte objects,
+        and ``seek(n, 1)`` to seek from current file position.
     n_strings : int, optional
         Number of byte strings to return
     bufsize: int, optional

nibabel/freesurfer/io.py

@@ -355,7 +355,7 @@ def read_annot(filepath, orig_ids=False):
         to any label and orig_ids=False, its id will be set to -1.
     ctab : ndarray, shape (n_labels, 5)
         RGBT + label id colortable array.
-    names : list of str (python 2), list of bytes (python 3)
+    names : list of bytes
         The names of the labels. The length of the list is n_labels.
     """
     with open(filepath, "rb") as fobj:

nibabel/gifti/gifti.py

@@ -13,8 +13,8 @@
 """
 
 import sys
-
 import numpy as np
+import base64
 
 from .. import xmlutils as xml
 from ..filebasedimages import SerializableImage
@@ -23,11 +23,6 @@
                    gifti_endian_codes, KIND2FMT)
 from ..deprecated import deprecate_with_version
 
-# {en,de}codestring in deprecated in Python3, but
-# {en,de}codebytes not available in Python2.
-# Therefore set the proper functions depending on the Python version.
-import base64
-
 
 class GiftiMetaData(xml.XmlSerializable):
     """ A sequence of GiftiNVPairs containing metadata for a gifti data array

nibabel/tests/scriptrunner.py

@@ -112,9 +112,9 @@ def run_command(self, cmd, check_code=True):
         -------
         returncode : int
             return code from execution of `cmd`
-        stdout : bytes (python 3) or str (python 2)
+        stdout : bytes
             stdout from `cmd`
-        stderr : bytes (python 3) or str (python 2)
+        stderr : bytes
             stderr from `cmd`
         """
         if isinstance(cmd, string_types):

nibabel/trackvis.py

@@ -325,7 +325,7 @@ def write(fileobj, streamlines, hdr_mapping=None, endianness=None,
     >>> pts1 = np.random.uniform(size=(10,3))
     >>> streamlines = ([(pts0, None, None), (pts1, None, None)])
     >>> write(file_obj, streamlines)
-    >>> _ = file_obj.seek(0) # returns 0 in python 3
+    >>> _ = file_obj.seek(0)  # returns 0
     >>> streams, hdr = read(file_obj)
     >>> len(streams)
     2

nibabel/volumeutils.py

@@ -479,7 +479,7 @@ def array_from_file(shape, in_dtype, infile, offset=0, order='F', mmap=True):
     >>> from io import BytesIO
     >>> bio = BytesIO()
     >>> arr = np.arange(6).reshape(1,2,3)
-    >>> _ = bio.write(arr.tostring('F')) # outputs int in python3
+    >>> _ = bio.write(arr.tostring('F'))  # outputs int
     >>> arr2 = array_from_file((1,2,3), arr.dtype, bio)
     >>> np.all(arr == arr2)
     True
@@ -609,7 +609,7 @@ def array_to_file(data, fileobj, out_dtype=None, offset=0,
     >>> array_to_file(data, sio, np.float)
     >>> sio.getvalue() == data.tostring('F')
     True
-    >>> _ = sio.truncate(0); _ = sio.seek(0) # outputs 0 in python 3
+    >>> _ = sio.truncate(0); _ = sio.seek(0)  # outputs 0
     >>> array_to_file(data, sio, np.int16)
     >>> sio.getvalue() == data.astype(np.int16).tostring()
     True