mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-16 23:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 81471-81472 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81471 | victor.stinner | 2010-05-22 15:37:56 +0200 (sam., 22 mai 2010) | 7 lines

  Issue #6268: More bugfixes about BOM, UTF-16 and UTF-32

   * Fix seek() method of codecs.open(), don't write the BOM twice after seek(0)
   * Fix reset() method of codecs, UTF-16, UTF-32 and StreamWriter classes
   * test_codecs: use "w+" mode instead of "wt+". "t" mode is not supported by
     Solaris or Windows, but does it really exist? I found it the in the issue.
........
  r81472 | victor.stinner | 2010-05-22 15:44:25 +0200 (sam., 22 mai 2010) | 4 lines

  Fix my last commit (r81471) about codecs

  Rememder: don't touch the code just before a commit
........
This commit is contained in:
Victor Stinner 2010-05-22 16:52:13 +00:00
parent e37049ccd7
commit 09c0f24f39
5 changed files with 78 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Lib/codecs.py
View file

@ -370,6 +370,11 @@ class StreamWriter(Codec):
"""
pass
def seek(self, offset, whence=0):
self.stream.seek(offset, whence)
if whence == 0 and offset == 0:
self.reset()
def __getattr__(self, name,
getattr=getattr):
@ -601,8 +606,8 @@ class StreamReader(Codec):
Resets the codec buffers used for keeping state.
"""
self.reset()
self.stream.seek(offset, whence)
self.reset()
def next(self):
@ -695,8 +700,10 @@ class StreamReaderWriter:
self.writer.reset()
def seek(self, offset, whence=0):
self.reader.seek(offset, whence)
self.writer.seek(offset, whence)
self.stream.seek(offset, whence)
self.reader.reset()
if whence == 0 and offset == 0:
self.writer.reset()
def __getattr__(self, name,
getattr=getattr):