[Python-checkins] python/dist/src/Lib codecs.py,1.35.2.1,1.35.2.2

[doerwalter at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7055/Lib

Modified Files:
      Tag: release24-maint
	codecs.py 
Log Message:
Backport checkin:
Fix and test for SF bug #1098990: codec readline() splits lines apart.


Index: codecs.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/codecs.py,v
retrieving revision 1.35.2.1
retrieving revision 1.35.2.2
diff -u -d -r1.35.2.1 -r1.35.2.2
--- codecs.py	21 Dec 2004 22:35:23 -0000	1.35.2.1
+++ codecs.py	10 Jan 2005 12:26:00 -0000	1.35.2.2
@@ -322,9 +322,9 @@
                         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