Skip to content

Commit 5529d85

Browse files
MNT: Apply pyupgrade suggestions
1 parent d33a05a commit 5529d85

21 files changed

+37
-41
lines changed

doc/tools/apigen.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def __init__(self,
4242
module_skip_patterns=None,
4343
other_defines=True
4444
):
45-
""" Initialize package for parsing
45+
r""" Initialize package for parsing
4646
4747
Parameters
4848
----------
@@ -358,7 +358,7 @@ def _survives_exclude(self, matchstr, match_type):
358358
return True
359359

360360
def discover_modules(self):
361-
""" Return module sequence discovered from ``self.package_name``
361+
r""" Return module sequence discovered from ``self.package_name``
362362
363363
364364
Parameters

nibabel/cifti2/cifti2.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -648,8 +648,8 @@ def __init__(self, name=None, voxel_indices_ijk=None, vertices=None):
648648
self.vertices = vertices if vertices is not None else []
649649
for val in self.vertices:
650650
if not isinstance(val, Cifti2Vertices):
651-
raise ValueError(('Cifti2Parcel vertices must be instances of '
652-
'Cifti2Vertices'))
651+
raise ValueError('Cifti2Parcel vertices must be instances of '
652+
'Cifti2Vertices')
653653

654654
@property
655655
def voxel_indices_ijk(self):

nibabel/cifti2/tests/test_axes.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,8 @@ def get_axes():
9393
yield get_parcels()
9494
yield get_scalar()
9595
yield get_label()
96-
for elem in get_brain_models():
97-
yield elem
98-
for elem in get_series():
99-
yield elem
96+
yield from get_brain_models()
97+
yield from get_series()
10098

10199

102100
def test_brain_models():

nibabel/cifti2/tests/test_cifti2io_header.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def test_read_nifti2():
5050
# Error trying to read a CIFTI-2 image from a NIfTI2-only image.
5151
filemap = ci.Cifti2Image.make_file_map()
5252
for k in filemap:
53-
filemap[k].fileobj = io.open(NIFTI2_DATA)
53+
filemap[k].fileobj = open(NIFTI2_DATA)
5454
with pytest.raises(ValueError):
5555
ci.Cifti2Image.from_file_map(filemap)
5656

nibabel/cmdline/ls.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ def proc_file(f, opts):
145145
freq = np.bincount(inv)
146146
counts = " ".join("%g:%d" % (i, f) for i, f in zip(items, freq))
147147
row += ["@l" + counts]
148-
except IOError as e:
148+
except OSError as e:
149149
verbose(2, f"Failed to obtain stats/counts -- {e}")
150150
row += [_err()]
151151
return row

nibabel/cmdline/parrec2nii.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ def proc_file(infile, opts):
158158
else:
159159
outfilename = basefilename + '.nii'
160160
if os.path.isfile(outfilename) and not opts.overwrite:
161-
raise IOError(f'Output file "{outfilename}" exists, use --overwrite to overwrite it')
161+
raise OSError(f'Output file "{outfilename}" exists, use --overwrite to overwrite it')
162162

163163
# load the PAR header and data
164164
scaling = 'dv' if opts.scaling == 'off' else opts.scaling

nibabel/ecat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ def get_series_framenumbers(mlist):
471471
try:
472472
frame_dict[frame_stored] = trueframenumbers[true_order] + 1
473473
except IndexError:
474-
raise IOError('Error in header or mlist order unknown')
474+
raise OSError('Error in header or mlist order unknown')
475475
return frame_dict
476476

477477

nibabel/filebasedimages.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ def _sniff_meta_for(klass, filename, sniff_nbytes, sniff=None):
430430
try:
431431
with ImageOpener(meta_fname, 'rb') as fobj:
432432
binaryblock = fobj.read(sniff_nbytes)
433-
except (IOError, EOFError):
433+
except (OSError, EOFError):
434434
return None
435435
return (binaryblock, meta_fname)
436436

@@ -564,7 +564,7 @@ def from_stream(klass, io_obj: io.IOBase):
564564
return klass.from_file_map(klass._filemap_from_iobase(io_obj))
565565

566566
def to_stream(self, io_obj: io.IOBase, **kwargs):
567-
"""Save image to writable IO stream
567+
r"""Save image to writable IO stream
568568
569569
Parameters
570570
----------

nibabel/freesurfer/io.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def _read_volume_info(fobj):
6868
'zras', 'cras']:
6969
pair = fobj.readline().decode('utf-8').split('=')
7070
if pair[0].strip() != key or len(pair) != 2:
71-
raise IOError('Error parsing volume info.')
71+
raise OSError('Error parsing volume info.')
7272
if key in ('valid', 'filename'):
7373
volume_info[key] = pair[1].strip()
7474
elif key == 'volume':

nibabel/gifti/gifti.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ class GiftiNVPairs:
154154
'GiftiNVPairs objects are deprecated. Use the GiftiMetaData object '
155155
'as a dict, instead.',
156156
'4.0', '6.0')
157-
def __init__(self, name=u'', value=u''):
157+
def __init__(self, name='', value=''):
158158
self._name = name
159159
self._value = value
160160
self._container = None
@@ -480,7 +480,7 @@ def __init__(self,
480480
coordsys=None,
481481
ordering="C",
482482
meta=None,
483-
ext_fname=u'',
483+
ext_fname='',
484484
ext_offset=0):
485485
"""
486486
Returns a shell object that cannot be saved.
@@ -702,7 +702,7 @@ class GiftiImage(xml.XmlSerializable, SerializableImage):
702702
parser = None
703703

704704
def __init__(self, header=None, extra=None, file_map=None, meta=None,
705-
labeltable=None, darrays=None, version=u"1.0"):
705+
labeltable=None, darrays=None, version="1.0"):
706706
super(GiftiImage, self).__init__(header=header, extra=extra,
707707
file_map=file_map)
708708
if darrays is None:

0 commit comments

Comments
 (0)