summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorInada Naoki <songofacandy@gmail.com>2020-04-17 06:56:35 (GMT)
committerGitHub <noreply@github.com>2020-04-17 06:56:35 (GMT)
commit485e715cb1ff92bc9882cd51ec32589f9cb30503 (patch)
tree55e3438c85d968dc72737b498960fec39ebf92bc
parentbf1a81258c0ecc8b52b9dcc53321c066b3ed4a67 (diff)
downloadcpython-485e715cb1ff92bc9882cd51ec32589f9cb30503.zip
cpython-485e715cb1ff92bc9882cd51ec32589f9cb30503.tar.gz
cpython-485e715cb1ff92bc9882cd51ec32589f9cb30503.tar.bz2
bpo-40287: Fix SpooledTemporaryFile.seek() return value (GH-19540)
It has not returned the file position after the seek.
-rw-r--r--Lib/tempfile.py2
-rw-r--r--Lib/test/test_tempfile.py6
-rw-r--r--Misc/NEWS.d/next/Library/2020-04-15-17-21-48.bpo-40287.-mkEJH.rst1
3 files changed, 6 insertions, 3 deletions
diff --git a/Lib/tempfile.py b/Lib/tempfile.py
index ed15c0f..ba04be8 100644
--- a/Lib/tempfile.py
+++ b/Lib/tempfile.py
@@ -738,7 +738,7 @@ class SpooledTemporaryFile:
return self._file.readlines(*args)
def seek(self, *args):
- self._file.seek(*args)
+ return self._file.seek(*args)
def tell(self):
return self._file.tell()
diff --git a/Lib/test/test_tempfile.py b/Lib/test/test_tempfile.py
index f4cba0f..69d5de2 100644
--- a/Lib/test/test_tempfile.py
+++ b/Lib/test/test_tempfile.py
@@ -1018,7 +1018,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')
@@ -1036,7 +1037,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.