summaryrefslogtreecommitdiff
path: root/Lib/codecs.py
diff options
context:
space:
mode:
authorWalter Dörwald <walter@livinglogic.de>2005-01-10 12:01:39 +0000
committerWalter Dörwald <walter@livinglogic.de>2005-01-10 12:01:39 +0000
commit120b4b587a4382cfc2caf8e354eb2dea61e5125f (patch)
tree26070c40ad01fb244df2824b3433c2b8212c116d /Lib/codecs.py
parent394cd1e1765227cbee2e6226265442a5b915d0ad (diff)
downloadcpython-120b4b587a4382cfc2caf8e354eb2dea61e5125f.tar.gz
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 f6d480cc98..b283925e01 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