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

[Marius Gedminas]

Log message for revision 70589:
  Apply the patch from http://www.zope.org/Collectors/Zope3-dev/535.  This fixes
  24 test failures 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/branches/3.3/doc/CHANGES.txt
  U   Zope3/branches/3.3/src/zope/publisher/http.py

-=-
Modified: Zope3/branches/3.3/doc/CHANGES.txt
===================================================================
--- Zope3/branches/3.3/doc/CHANGES.txt	2006-10-09 17:38:26 UTC (rev 70588)
+++ Zope3/branches/3.3/doc/CHANGES.txt	2006-10-09 17:48:31 UTC (rev 70589)
@@ -10,6 +10,8 @@
 
     Bugfixes
 
+      - Fixed issue 535: make HTTPInputStream work with Python 2.4.4.
+
       - Improved fix for issue 599: Made sure i18n Message based Invalid
         exceptions are handled correctly.
 

Modified: Zope3/branches/3.3/src/zope/publisher/http.py
===================================================================
--- Zope3/branches/3.3/src/zope/publisher/http.py	2006-10-09 17:38:26 UTC (rev 70588)
+++ Zope3/branches/3.3/src/zope/publisher/http.py	2006-10-09 17:48:31 UTC (rev 70589)
@@ -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