[Zope3-checkins] SVN: Zope3/branches/3.2/ Apply the patch from http://www.zope.org/Collectors/Zope3-dev/535. This fixes

[Marius Gedminas]

Log message for revision 70587:
  Apply the patch from http://www.zope.org/Collectors/Zope3-dev/535.  This fixes
  22 test failures when I run test.py -p zope with Python 2.4.4 prerelease.
  
  

Changed:
  U   Zope3/branches/3.2/doc/CHANGES.txt
  U   Zope3/branches/3.2/src/zope/publisher/http.py

-=-
Modified: Zope3/branches/3.2/doc/CHANGES.txt
===================================================================
--- Zope3/branches/3.2/doc/CHANGES.txt	2006-10-09 14:40:36 UTC (rev 70586)
+++ Zope3/branches/3.2/doc/CHANGES.txt	2006-10-09 17:18:45 UTC (rev 70587)
@@ -10,7 +10,7 @@
 
     Bug fixes
 
-      - ...
+      - Fixed issue 535: make HTTPInputStream work with Python 2.4.4.
 
   Zope 3.2.2 (2006/10/02)
 

Modified: Zope3/branches/3.2/src/zope/publisher/http.py
===================================================================
--- Zope3/branches/3.2/src/zope/publisher/http.py	2006-10-09 14:40:36 UTC (rev 70586)
+++ Zope3/branches/3.2/src/zope/publisher/http.py	2006-10-09 17:18:45 UTC (rev 70587)
@@ -198,8 +198,8 @@
         self.cacheStream.write(data)
         return data
 
-    def readline(self):
-        data = self.stream.readline()
+    def readline(self, size=None):
+        data = self.stream.readline(size)
         self.cacheStream.write(data)
         return data