8000 RF: set default GIFTI strings as unicode · nipy/nibabel@61c9005 · GitHub
[go: up one dir, main page]

Skip to content

Commit 61c9005

Browse files
committed
RF: set default GIFTI strings as unicode
Specify all default GIFTI strings as unicode.
1 parent 4b1a55c commit 61c9005

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

nibabel/gifti/gifti.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class GiftiNVPairs(object):
8181
name : str
8282
value : str
8383
"""
84-
def __init__(self, name='', value=''):
84+
def __init__(self, name=u'', value=u''):
8585
self.name = name
8686
self.value = value
8787

@@ -344,7 +344,7 @@ def __init__(self,
344344
coordsys=None,
345345
ordering="C",
346346
meta=None,
347-
ext_fname='',
347+
ext_fname=u'',
348348
ext_offset=0):
349349
"""
350350
Returns a shell object that cannot be saved.
@@ -518,7 +518,8 @@ def metadata(self):
518518

519519

520520
class GiftiImage(xml.XmlSerializable, FileBasedImage):
521-
"""
521+
""" GIFTI image object
522+
522523
The Gifti spec suggests using the following suffixes to your
523524
filename when saving each specific type of data:
524525
@@ -554,7 +555,7 @@ class GiftiImage(xml.XmlSerializable, FileBasedImage):
554555
parser = None
555556

556557
def __init__(self, header=None, extra=None, file_map=None, meta=None,
557-
labeltable=None, darrays=None, version="1.0"):
558+
labeltable=None, darrays=None, version=u"1.0"):
558559
super(GiftiImage, self).__init__(header=header, extra=extra,
559560
file_map=file_map)
560561
if darrays is None:

nibabel/gifti/tests/test_parse_gifti_fast.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,13 @@ def assert_default_types(loaded):
107107
if defaulttype is type(None):
108108
continue
109109
loadedtype = type(getattr(loaded, attr))
110-
assert loadedtype == defaulttype, \
111-
"Type mismatch for attribute: {} ({!s} != {!s})".format(
112-
attr, loadedtype, defaulttype)
110+
assert_equal(loadedtype, defaulttype,
111+
"Type mismatch for attribute: {} ({!s} != {!s})".format(
112+
attr, loadedtype, defaulttype))
113113

114114

115115
def test_default_types():
4C86 116+
# Test that variable types are same in loaded and default instances
116117
for fname in datafiles:
117118
img = load(fname)
118119
# GiftiImage

0 commit comments

Comments
 (0)
0