FIX: Decode

Author: larsoner

nibabel/casting.py

@@ -796,10 +796,3 @@ 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,8 +1,6 @@
 """Utilities for working with DICOM datasets
 """
 
-from nibabel.casting import asstr
-
 
 def find_private_section(dcm_data, group_no, creator):
     """Return start element in group `group_no` given creator name `creator`
@@ -19,10 +17,10 @@ def find_private_section(dcm_data, group_no, creator):
         ``tag``, ``VR``, ``value``
     group_no : int
         Group number in which to search
-    creator : str or bytes or regex
-        Name of section - e.g. 'SIEMENS CSA HEADER' - or regex to search for
+    creator : bytes or regex
+        Name of section - e.g. b'SIEMENS CSA HEADER' - or regex to search for
         section name.  Regex used via ``creator.search(element_value)`` where
-        ``element_value`` is the value of the data element.
+        ``element_value`` is the decoded value of the data element.
 
     Returns
     -------
@@ -31,15 +29,17 @@ def find_private_section(dcm_data, group_no, creator):
     """
     if hasattr(creator, 'search'):
         match_func = creator.search
-    else:  # assume string / bytes
-        match_func = asstr(creator).__eq__
+    else:  # assume bytes
+        creator = creator.decode('latin-1')
+        match_func = creator.__eq__
     # Group elements assumed ordered by tag (groupno, elno)
     for element in dcm_data.group_dataset(group_no):
         elno = element.tag.elem
         if elno > 0xFF:
             break
         if element.VR not in ('LO', 'OB'):
             continue
-        if match_func(asstr(element.value)):
+        val = element.value.decode('latin-1')
+        if match_func(val):
             return elno * 0x100
     return None

nibabel/nifti1.py

@@ -21,7 +21,7 @@
 from . import analyze  # module import
 from .arrayproxy import get_obj_dtype
 from .batteryrunners import Report
-from .casting import have_binary128, asstr
+from .casting import have_binary128
 from .deprecated import alert_future_error
 from .filebasedimages import ImageFileError, SerializableImage
 from .optpkg import optional_package
@@ -1404,7 +1404,7 @@ def get_intent(self, code_repr='label'):
             raise TypeError('repr can be "label" or "code"')
         n_params = len(recoder.parameters[code]) if known_intent else 0
         params = (float(hdr['intent_p%d' % (i + 1)]) for i in range(n_params))
-        name = asstr(hdr['intent_name'].item())
+        name = hdr['intent_name'].item().decode('latin-1')
         return label, tuple(params), name
 
     def set_intent(self, code, params=(), name='', allow_unknown=False):
@@ -1740,7 +1740,8 @@ def _chk_magic(hdr, fix=False):
         magic = hdr['magic'].item()
         if magic in (hdr.pair_magic, hdr.single_magic):
             return hdr, rep
-        rep.problem_msg = f'magic string "{asstr(magic)}" is not valid'
+        magic = magic.decode('latin-1')
+        rep.problem_msg = f'magic string "{magic}" is not valid'
         rep.problem_level = 45
         if fix:
             rep.fix_msg = 'leaving as is, but future errors are likely'

nibabel/streamlines/trk.py

@@ -9,7 +9,6 @@
 import numpy as np
 
 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
@@ -180,7 +179,7 @@ def decode_value_from_name(encoded_name):
     value : int
         Value decoded from the name.
     """
-    encoded_name = asstr(encoded_name)
+    encoded_name = encoded_name.decode('latin1')
     if len(encoded_name) == 0:
         return encoded_name, 0
 
@@ -740,14 +739,25 @@ def __str__(self):
                     vars[attr] = vars[hdr_field]
 
         nb_scalars = self.header[Field.NB_SCALARS_PER_POINT]
-        scalar_names = [asstr(s) for s in vars['scalar_name'][:nb_scalars] if len(s) > 0]
+        scalar_names = [
+            s.decode('latin-1')
+            for s in vars['scalar_name'][:nb_scalars]
+            if len(s) > 0
+        ]
         vars['scalar_names'] = '\n  '.join(scalar_names)
         nb_properties = self.header[Field.NB_PROPERTIES_PER_STREAMLINE]
-        property_names = [asstr(s) for s in vars['property_name'][:nb_properties] if len(s) > 0]
+        property_names = [
+            s.decode('latin-1')
+            for s in vars['property_name'][:nb_properties]
+            if len(s) > 0
+        ]
         vars['property_names'] = '\n  '.join(property_names)
         # Make all byte strings into strings
         # Fixes recursion error on Python 3.3
-        vars = {k: asstr(v) if hasattr(v, 'decode') else v for k, v in vars.items()}
+        vars = {
+            k: v.decode('latin-1') if hasattr(v, 'decode') else v
+            for k, v in vars.items()
+        }
         return """\
 MAGIC NUMBER: {MAGIC_NUMBER}
 v.{version}

nibabel/tests/test_openers.py

@@ -19,7 +19,6 @@
 import pytest
 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
@@ -345,7 +344,7 @@ def test_iter():
                     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
+                    assert back_line.decode('latin-1').rstrip() == line
             if not does_t:
                 continue
             with Opener(input, 'rt') as fobj: