Skip to content

Commit e49e33c

Browse files
committed
Merge pull request #108 from matthew-brett/ecat-write-fixes
Ecat write fixes Fix failing docest Probable fix for windows test error for failure to delete temporary file.
2 parents 1e84540 + e5fd923 commit e49e33c

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

nibabel/ecat.py

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -407,13 +407,13 @@ def __init__(self,fileobj, hdr):
407407
Returns
408408
-------
409409
mlist : numpy recarray nframes X 4 columns
410-
1 - Matrix identifier.
411-
2 - subheader record number
412-
3 - Last record number of matrix data block.
413-
4 - Matrix status:
414-
1 - exists - rw
415-
2 - exists - ro
416-
3 - matrix deleted
410+
1 - Matrix identifier.
411+
2 - subheader record number
412+
3 - Last record number of matrix data block.
413+
4 - Matrix status:
414+
1 - exists - rw
415+
2 - exists - ro
416+
3 - matrix deleted
417417
"""
418418
self.hdr = hdr
419419
self._mlist = self.get_mlist(fileobj)
@@ -473,9 +473,7 @@ def get_frame_order(self):
473473
>>> img = ecat.load(ecat_file)
474474
>>> mlist = img.get_mlist()
475475
>>> mlist.get_frame_order()
476-
{0: [0, 16842758.0]}
477-
478-
476+
{0: [0, 16842758]}
479477
"""
480478
mlist = self._mlist
481479
ids = mlist[:, 0].copy()

nibabel/tests/test_ecat.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,13 @@ def test_file(self):
201201

202202
def test_save(self):
203203
tmp_file = 'tinypet_tmp.v'
204-
with InTemporaryDirectory() as tmp_dir:
204+
with InTemporaryDirectory():
205205
self.img.to_filename(tmp_file)
206206
other = self.image_class.load(tmp_file)
207207
assert_equal(self.img.get_data().all(), other.get_data().all())
208+
# Delete object holding reference to temporary file to make Windows
209+
# happier.
210+
del other
208211

209212
def test_data(self):
210213
dat = self.img.get_data()

0 commit comments

Comments
 (0)