From: Guido van Rossum <guido@python.org>
Date: Wed, 2 Feb 2000 16:51:06 +0000 (+0000)
Subject: Make read() and readlines() conform more to the file object interface:
X-Git-Tag: v1.6a1~514
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5606801b64e9e4a599eb416ec6a0c19b5e27a092;p=thirdparty%2FPython%2Fcpython.git

Make read() and readlines() conform more to the file object interface:
the default arg for read() is -1, not None, and readlines() has an
optional argument (which for now is ignored).
---

diff --git a/Lib/gzip.py b/Lib/gzip.py
index c0aff91150c4..0ba2ac22f753 100644
--- a/Lib/gzip.py
+++ b/Lib/gzip.py
@@ -139,12 +139,12 @@ class GzipFile:
     def writelines(self,lines):
         self.write(string.join(lines))
 
-    def read(self, size=None):
+    def read(self, size=-1):
         if self.extrasize <= 0 and self.fileobj is None:
             return ''
 
         readsize = 1024
-        if not size:        # get the whole thing
+        if size < 0:        # get the whole thing
             try:
                 while 1:
                     self._read(readsize)
@@ -281,7 +281,7 @@ class GzipFile:
             bufs.append(c)
             readsize = readsize * 2
 
-    def readlines(self):
+    def readlines(self, ignored=None):
         buf = self.read()
         lines = string.split(buf, '\n')
         for i in range(len(lines)-1):