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

[Marius Gedminas]

Log message for revision 70588:
  Apply the patch from http://www.zope.org/Collectors/Zope3-dev/535.  This fixes
  24 test failures and 1 error when I run test.py -p zope with Python 2.4.4
  prerelease.
  
  Merged from the 3.2 branch with the wonderful ezmerge.py that actually did this:
  
    svn merge -r 70586:70587 svn+ssh://svn.zope.org/repos/main/Zope3/branches/3.2 .
  
  

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

-=-
Modified: Zope3/trunk/doc/CHANGES.txt
===================================================================
--- Zope3/trunk/doc/CHANGES.txt	2006-10-09 17:18:45 UTC (rev 70587)
+++ Zope3/trunk/doc/CHANGES.txt	2006-10-09 17:38:26 UTC (rev 70588)
@@ -133,6 +133,8 @@
 
     Bug fixes
 
+      - Fixed issue 535: make HTTPInputStream work with Python 2.4.4.
+
       - As part of zope.decorator refactoring, its dependancy were not removed
         from DEPENDENCIES.cfg in zope.location.  Also zope.security.decorator
         doctests were not running due to missing boilerplate code.

Modified: Zope3/trunk/src/zope/publisher/http.py
===================================================================
--- Zope3/trunk/src/zope/publisher/http.py	2006-10-09 17:18:45 UTC (rev 70587)
+++ Zope3/trunk/src/zope/publisher/http.py	2006-10-09 17:38:26 UTC (rev 70588)
@@ -204,8 +204,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