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)
........
This commit is contained in:
Victor Stinner 2010-05-22 02:12:28 +00:00
parent 9a4a01df75
commit f5a3eafaac
3 changed files with 28 additions and 0 deletions

View File

@ -694,6 +694,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):

View File

@ -1488,6 +1488,26 @@ class WithStmtTest(unittest.TestCase):
self.assertEquals(srw.read(), u"\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', 'wt+', 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():
test_support.run_unittest(
UTF32Test,
@ -1516,6 +1536,7 @@ def test_main():
BasicStrTest,
CharmapTest,
WithStmtTest,
BomTest,
)

View File

@ -55,6 +55,9 @@ C-API
Library
-------
- Issue #6268: Fix seek() method of codecs.open(), don't read the BOM twice
after seek(0)
- Issue #5640: Fix Shift-JIS incremental encoder for error handlers different
than strict