diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-05-22 16:52:13 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-05-22 16:52:13 (GMT) |
| commit | 09c0f24f3934ac7cb1ddeef3a882d7e4576c7fc9 (patch) | |
| tree | dda27eab54d72372e0a5082b2226474af4fa9af5 /Lib/encodings/utf_16.py | |
| parent | e37049ccd7084646521add48478601d5b425300d (diff) | |
| download | cpython-09c0f24f3934ac7cb1ddeef3a882d7e4576c7fc9.zip cpython-09c0f24f3934ac7cb1ddeef3a882d7e4576c7fc9.tar.gz cpython-09c0f24f3934ac7cb1ddeef3a882d7e4576c7fc9.tar.bz2 | |
Merged revisions 81471-81472 via svnmerge from
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
........
Diffstat (limited to 'Lib/encodings/utf_16.py')
| -rw-r--r-- | Lib/encodings/utf_16.py | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/Lib/encodings/utf_16.py b/Lib/encodings/utf_16.py index eff08f3..b145a5d 100644 --- a/Lib/encodings/utf_16.py +++ b/Lib/encodings/utf_16.py @@ -58,17 +58,23 @@ class IncrementalDecoder(codecs.BufferedIncrementalDecoder): class StreamWriter(codecs.StreamWriter): def __init__(self, stream, errors='strict'): - self.bom_written = False codecs.StreamWriter.__init__(self, stream, errors) + self.encoder = None + + def reset(self): + codecs.StreamWriter.reset(self) + self.encoder = None def encode(self, input, errors='strict'): - self.bom_written = True - result = codecs.utf_16_encode(input, errors) - if sys.byteorder == 'little': - self.encode = codecs.utf_16_le_encode + if self.encoder is None: + result = codecs.utf_16_encode(input, errors) + if sys.byteorder == 'little': + self.encoder = codecs.utf_16_le_encode + else: + self.encoder = codecs.utf_16_be_encode + return result else: - self.encode = codecs.utf_16_be_encode - return result + return self.encoder(input, errors) class StreamReader(codecs.StreamReader): |