[Zope3-checkins] SVN: Zope3/branches/stephan_and_jim-response-refactor/src/zope/publisher/ Updated backward compat hack to accept keyword arguments.

[Jim Fulton]

Log message for revision 38267:
  Updated backward compat hack to accept keyword arguments.
  

Changed:
  U   Zope3/branches/stephan_and_jim-response-refactor/src/zope/publisher/browser.py
  U   Zope3/branches/stephan_and_jim-response-refactor/src/zope/publisher/http.py

-=-
Modified: Zope3/branches/stephan_and_jim-response-refactor/src/zope/publisher/browser.py
===================================================================
--- Zope3/branches/stephan_and_jim-response-refactor/src/zope/publisher/browser.py	2005-09-02 21:16:30 UTC (rev 38266)
+++ Zope3/branches/stephan_and_jim-response-refactor/src/zope/publisher/browser.py	2005-09-02 21:22:43 UTC (rev 38267)
@@ -599,7 +599,7 @@
     """
 
     def __init__(self, body_instream=None, environ=None, form=None,
-                 skin=None, bbb=None,
+                 skin=None, outstream=None,
                  **kw):
 
         _testEnv =  {
@@ -617,7 +617,7 @@
                 warnings.warn("Can't pass output streams to requests anymore",
                               DeprecationWarning,
                               2)
-                environ, form, skin = form, skin, bbb
+                environ, form, skin = form, skin, outstream
                 _testEnv.update(environ)
                 
         if kw:

Modified: Zope3/branches/stephan_and_jim-response-refactor/src/zope/publisher/http.py
===================================================================
--- Zope3/branches/stephan_and_jim-response-refactor/src/zope/publisher/http.py	2005-09-02 21:16:30 UTC (rev 38266)
+++ Zope3/branches/stephan_and_jim-response-refactor/src/zope/publisher/http.py	2005-09-02 21:22:43 UTC (rev 38267)
@@ -235,7 +235,7 @@
 
     retry_max_count = 3    # How many times we're willing to retry
 
-    def __init__(self, body_instream, environ, response=None, bbb=None):
+    def __init__(self, body_instream, environ, response=None, outstream=None):
         # XXX BBB
         try:
             environ.get
@@ -244,7 +244,7 @@
             warnings.warn("Can't pass output streams to requests anymore",
                           DeprecationWarning,
                           2)
-            environ, response = response, bbb
+            environ, response = response, outstream
             
         super(HTTPRequest, self).__init__(body_instream, environ, response)