From 235ee75697c14e9f35c527b196e77e60045a5d59 Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Wed, 15 Apr 2020 16:56:35 +0900 Subject: [PATCH 1/4] bpo-40287: Fix SpooledTemporaryFile.seek() return value --- Lib/tempfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/tempfile.py b/Lib/tempfile.py index ed15c0fd1f8afc..ba04be8f9058e1 100644 --- a/Lib/tempfile.py +++ b/Lib/tempfile.py @@ -738,7 +738,7 @@ def readlines(self, *args): 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() From 6aaa9cd36ccc5872a89ab22983aaa584c954192f Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Wed, 15 Apr 2020 17:21:51 +0900 Subject: [PATCH 2/4] Add news entry --- .../NEWS.d/next/Library/2020-04-15-17-21-48.bpo-40287.-mkEJH.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/Library/2020-04-15-17-21-48.bpo-40287.-mkEJH.rst 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 00000000000000..fe1fc458660b30 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-04-15-17-21-48.bpo-40287.-mkEJH.rst @@ -0,0 +1 @@ +Fixed ``SpooledTemporaryFile.seek()`` did not return the position. From a5a62daef75613eaa74c179cb537150dae1c8116 Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Thu, 16 Apr 2020 13:10:36 +0900 Subject: [PATCH 3/4] Update 2020-04-15-17-21-48.bpo-40287.-mkEJH.rst --- .../next/Library/2020-04-15-17-21-48.bpo-40287.-mkEJH.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index fe1fc458660b30..d4db192b710768 100644 --- 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 @@ -1 +1 @@ -Fixed ``SpooledTemporaryFile.seek()`` did not return the position. +Fixed ``SpooledTemporaryFile.seek()`` to return the position. From fcbaedf244313193fb12c54ed366fa69ffab257f Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Fri, 17 Apr 2020 12:51:40 +0900 Subject: [PATCH 4/4] check return value --- Lib/test/test_tempfile.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_tempfile.py b/Lib/test/test_tempfile.py index f4cba0fa8dcf19..69d5de2e1b95f4 100644 --- a/Lib/test/test_tempfile.py +++ b/Lib/test/test_tempfile.py @@ -1018,7 +1018,8 @@ def test_writelines(self): # 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 @@ def test_sparse(self): # 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)