diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-04-17 07:13:34 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-17 07:13:34 (GMT) |
| commit | 11ae7d075293fe855c8af26b577656d1026cd9bb (patch) | |
| tree | 8a5883f66f465411a8789b9ea53500ef31e39cda | |
| parent | 6fd47fabe04a1d52c61e87d594d10dd65e6432ee (diff) | |
| download | cpython-11ae7d075293fe855c8af26b577656d1026cd9bb.zip cpython-11ae7d075293fe855c8af26b577656d1026cd9bb.tar.gz cpython-11ae7d075293fe855c8af26b577656d1026cd9bb.tar.bz2 | |
bpo-40287: Fix SpooledTemporaryFile.seek() return value (GH-19540)
It has not returned the file position after the seek.
(cherry picked from commit 485e715cb1ff92bc9882cd51ec32589f9cb30503)
Co-authored-by: Inada Naoki <songofacandy@gmail.com>
| -rw-r--r-- | Lib/tempfile.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_tempfile.py | 6 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2020-04-15-17-21-48.bpo-40287.-mkEJH.rst | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/Lib/tempfile.py b/Lib/tempfile.py index 24f673c..f92db53 100644 --- a/Lib/tempfile.py +++ b/Lib/tempfile.py @@ -744,7 +744,7 @@ class SpooledTemporaryFile: return self._file.readlines(*args) def seek(self, *args): - self._file.seek(*args) + return self._file.seek(*args) @property def softspace(self): diff --git a/Lib/test/test_tempfile.py b/Lib/test/test_tempfile.py index c046420..2d47e70 100644 --- a/Lib/test/test_tempfile.py +++ b/Lib/test/test_tempfile.py @@ -1034,7 +1034,8 @@ class TestSpooledTemporaryFile(BaseTestCase): # Verify writelines with a SpooledTemporaryFile f = self.do_create() f.writelines((b'x', b'y', b'z')) - f.seek(0) + pos = f.seek(0) + self.assertEqual(pos, 0) buf = f.read() self.assertEqual(buf, b'xyz') @@ -1052,7 +1053,8 @@ class TestSpooledTemporaryFile(BaseTestCase): # when that occurs f = self.do_create(max_size=30) self.assertFalse(f._rolled) - f.seek(100, 0) + pos = f.seek(100, 0) + self.assertEqual(pos, 100) self.assertFalse(f._rolled) f.write(b'x') self.assertTrue(f._rolled) diff --git a/Misc/NEWS.d/next/Library/2020-04-15-17-21-48.bpo-40287.-mkEJH.rst b/Misc/NEWS.d/next/Library/2020-04-15-17-21-48.bpo-40287.-mkEJH.rst new file mode 100644 index 0000000..d4db192 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-04-15-17-21-48.bpo-40287.-mkEJH.rst @@ -0,0 +1 @@ +Fixed ``SpooledTemporaryFile.seek()`` to return the position. |