diff options
| author | Walter Dörwald <walter@livinglogic.de> | 2005-01-10 12:26:00 (GMT) |
|---|---|---|
| committer | Walter Dörwald <walter@livinglogic.de> | 2005-01-10 12:26:00 (GMT) |
| commit | 55d3a19643b00ff8f54aac7b3aeeeb4a62ec7e7a (patch) | |
| tree | f3804ea7503d0b2caabe4ce7b432c7c8a79d424b /Lib/codecs.py | |
| parent | 9632e94afbe172ef30f394c8fb7d896ed6e43f87 (diff) | |
| download | cpython-55d3a19643b00ff8f54aac7b3aeeeb4a62ec7e7a.zip cpython-55d3a19643b00ff8f54aac7b3aeeeb4a62ec7e7a.tar.gz cpython-55d3a19643b00ff8f54aac7b3aeeeb4a62ec7e7a.tar.bz2 | |
Backport checkin:
Fix and test for SF bug #1098990: codec readline() splits lines apart.
Diffstat (limited to 'Lib/codecs.py')
| -rw-r--r-- | Lib/codecs.py | 4 |
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 |