From 37b8200608c8c78b45d41b032aed4f9d9e5c8151 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Sat, 22 May 2010 02:17:42 +0000 Subject: [PATCH] Merged revisions 81461 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r81461 | victor.stinner | 2010-05-22 04:16:27 +0200 (sam., 22 mai 2010) | 10 lines Merged revisions 81459 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r81459 | victor.stinner | 2010-05-22 04:11:07 +0200 (sam., 22 mai 2010) | 3 lines Issue #6268: Fix seek() method of codecs.open(), don't read the BOM twice after seek(0) ........ ................ --- Lib/codecs.py | 4 ++++ Lib/test/test_codecs.py | 21 +++++++++++++++++++++ Misc/NEWS | 3 +++ 3 files changed, 28 insertions(+) diff --git a/Lib/codecs.py b/Lib/codecs.py index f05c4f7e2d..9490602ad3 100644 --- a/Lib/codecs.py +++ b/Lib/codecs.py @@ -699,6 +699,10 @@ class StreamReaderWriter: self.reader.reset() self.writer.reset() + def seek(self, offset, whence=0): + self.reader.seek(offset, whence) + self.writer.seek(offset, whence) + def __getattr__(self, name, getattr=getattr): diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py index 227e37513f..1316572373 100644 --- a/Lib/test/test_codecs.py +++ b/Lib/test/test_codecs.py @@ -1592,6 +1592,26 @@ class SurrogateEscapeTest(unittest.TestCase): b"\xe4\xeb\xef\xf6\xfc") +class BomTest(unittest.TestCase): + def test_seek0(self): + data = "1234567890" + tests = ("utf-16", + "utf-16-le", + "utf-16-be", + "utf-32", + "utf-32-le", + "utf-32-be") + for encoding in tests: + with codecs.open('foo', 'w+', encoding=encoding) as f: + # Check if the BOM is written only once + f.write(data) + f.write(data) + f.seek(0) + self.assertEquals(f.read(), data * 2) + f.seek(0) + self.assertEquals(f.read(), data * 2) + + def test_main(): support.run_unittest( UTF32Test, @@ -1619,6 +1639,7 @@ def test_main(): WithStmtTest, TypesTest, SurrogateEscapeTest, + BomTest, ) diff --git a/Misc/NEWS b/Misc/NEWS index 32f188c6ca..54ebf596d7 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -54,6 +54,9 @@ C-API Library ------- +- Issue #6268: Fix seek() method of codecs.open(), don't read the BOM twice + after seek(0) + - Issue #8782: Add a trailing newline in linecache.updatecache to the last line of files without one. -- 2.40.0