mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-26 11:45:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Make attributes and local variables in the StreamReader str objects instead

Browse source 
of unicode objects, so that codecs that do a str->str decoding won't promote
the result to unicode. This fixes SF bug #1241507.
This commit is contained in:
Walter Dörwald 2005-07-20 22:15:39 +00:00
parent 21c825417f
commit c9878e1b22
2 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/codecs.py
View file

@ -229,7 +229,9 @@ class StreamReader(Codec):
self.stream = stream
self.errors = errors
self.bytebuffer = ""
self.charbuffer = u""
# For str->str decoding this will stay a str
# For str->unicode decoding the first read will promote it to unicode
self.charbuffer = ""
def decode(self, input, errors='strict'):
raise NotImplementedError
@ -284,7 +286,7 @@ class StreamReader(Codec):
if chars < 0:
# Return everything we've got
result = self.charbuffer
self.charbuffer = u""
self.charbuffer = ""
else:
# Return the first chars characters
result = self.charbuffer[:chars]
@ -301,7 +303,7 @@ class StreamReader(Codec):
"""
readsize = size or 72
line = u""
line = ""
# If size is given, we call read() only once
while True:
data = self.read(readsize)
@ -309,7 +311,7 @@ class StreamReader(Codec):
# If we're at a "\r" read one extra character (which might
# be a "\n") to get a proper line ending. If the stream is
# temporarily exhausted we return the wrong line ending.
if data.endswith(u"\r"):
if data.endswith("\r"):
data += self.read(size=1, chars=1)
line += data
@ -319,7 +321,7 @@ class StreamReader(Codec):
line0withoutend = lines[0].splitlines(False)[0]
if line0withend != line0withoutend: # We really have a line end
# Put the rest back together and keep it until the next call
self.charbuffer = u"".join(lines[1:]) + self.charbuffer
self.charbuffer = "".join(lines[1:]) + self.charbuffer
if keepends:
line = line0withend
else: