summaryrefslogtreecommitdiffstats
path: root/Lib/codecs.py
diff options
context:
space:
mode:
authorWalter Dörwald <walter@livinglogic.de>2005-01-10 12:01:39 (GMT)
committerWalter Dörwald <walter@livinglogic.de>2005-01-10 12:01:39 (GMT)
commit9fa094677186b4bb05e488e5bc9d5dfe7ec32812 (patch)
treed12868a66f07665fa198640df412ccbcef102fb2 /Lib/codecs.py
parentc0b194a77082f2db4b5689a27e73f07fa046fa79 (diff)
downloadcpython-9fa094677186b4bb05e488e5bc9d5dfe7ec32812.zip
cpython-9fa094677186b4bb05e488e5bc9d5dfe7ec32812.tar.gz
cpython-9fa094677186b4bb05e488e5bc9d5dfe7ec32812.tar.bz2
Fix and test for SF bug #1098990: codec readline() splits lines apart.
Diffstat (limited to 'Lib/codecs.py')
-rw-r--r--Lib/codecs.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/codecs.py b/Lib/codecs.py
index f6d480c..b283925 100644
--- a/Lib/codecs.py
+++ b/Lib/codecs.py
@@ -322,9 +322,9 @@ class StreamReader(Codec):
line = line0withend
else:
line = line0withoutend
- break
+ break
# we didn't get anything or this was our only try
- elif not data or size is not None:
+ if not data or size is not None:
if line and not keepends:
line = line.splitlines(False)[0]
break