]> granicus.if.org Git - python/commitdiff
Patch by Lars Wirzenius to allow f.readline(length).
authorGuido van Rossum <guido@python.org>
Fri, 25 Jul 1997 14:56:01 +0000 (14:56 +0000)
committerGuido van Rossum <guido@python.org>
Fri, 25 Jul 1997 14:56:01 +0000 (14:56 +0000)
Lib/StringIO.py

index bbd942854139b97fd3c5245ea22790ac927d8caa..dba38e42c0a06271720a79ff7d71cf75fa160480 100644 (file)
@@ -64,7 +64,7 @@ class StringIO:
                r = self.buf[self.pos:newpos]
                self.pos = newpos
                return r
-       def readline(self):
+       def readline(self, length=None):
                if self.buflist:
                        self.buf = self.buf + string.joinfields(self.buflist, '')
                        self.buflist = []
@@ -73,6 +73,9 @@ class StringIO:
                        newpos = self.len
                else:
                        newpos = i+1
+               if length is not None:
+                       if self.pos + length < newpos:
+                               newpos = self.pos + length
                r = self.buf[self.pos:newpos]
                self.pos = newpos
                return r