Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Lib/tempfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,7 @@ def __exit__(self, exc, value, tb):

# file protocol
def __iter__(self):
return self._file.__iter__()
return super().__iter__()

def __del__(self):
if not self.closed:
Expand Down
35 changes: 35 additions & 0 deletions Lib/test/test_tempfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -1230,6 +1230,41 @@ def test_is_iobase(self):
# SpooledTemporaryFile should implement io.IOBase
self.assertIsInstance(self.do_create(), io.IOBase)

def test_iteration_rollover(self):
for mode, data in [('w+b', b'first\nsecond\nthird\n'),
('w+', 'first\nsecond\nthird\n')]:
with self.subTest(mode=mode):
kwargs = {} if 'b' in mode else {'encoding': 'utf-8',
'newline': '\n'}
with tempfile.SpooledTemporaryFile(mode=mode, **kwargs) as f:
f.write(data)
f.seek(0)
iterator = iter(f)
self.assertEqual(next(iterator), data[:6])
f.rollover()
self.assertEqual(next(iterator), data[6:13])
self.assertEqual(f.tell(), 13)
self.assertEqual(f.read(), data[13:])
self.assertRaises(StopIteration, next, iterator)

def test_iterator_identity(self):
for mode in ('w+b', 'w+'):
with self.subTest(mode=mode):
with tempfile.SpooledTemporaryFile(mode=mode) as f:
self.assertIs(iter(f), f)
f.rollover()
self.assertIs(iter(f), f)

def test_iteration_closed(self):
for mode in ('w+b', 'w+'):
for rolled in (False, True):
with self.subTest(mode=mode, rolled=rolled):
f = tempfile.SpooledTemporaryFile(mode=mode)
if rolled:
f.rollover()
f.close()
self.assertRaises(ValueError, iter, f)

def test_iobase_interface(self):
# SpooledTemporaryFile should implement the io.IOBase interface.
# Ensure it has all the required methods and properties.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix iteration over :class:`tempfile.SpooledTemporaryFile` when the file rolls
over to disk during iteration.
Loading