[Zope-CVS] SVN: soap/trunk/ Zope 3.2 compatibility

[Fred L. Drake, Jr.]

Log message for revision 41584:
  Zope 3.2 compatibility

Changed:
  U   soap/trunk/publisher.py
  U   soap/trunk/tests/test_soappublication.py
  U   soap/trunk/tests/test_soaprequest.py

-=-
Modified: soap/trunk/publisher.py
===================================================================
--- soap/trunk/publisher.py	2006-02-08 21:02:35 UTC (rev 41583)
+++ soap/trunk/publisher.py	2006-02-08 22:25:28 UTC (rev 41584)
@@ -61,9 +61,9 @@
     def _getPositionalArguments(self):
         return self._args
 
-    def _createResponse(self, outstream):
+    def _createResponse(self):
         """Create a specific SOAP response object."""
-        return SOAPResponse(outstream)
+        return SOAPResponse()
 
     def _setError(self, error):
         self._getResponse()._error = error

Modified: soap/trunk/tests/test_soappublication.py
===================================================================
--- soap/trunk/tests/test_soappublication.py	2006-02-08 21:02:35 UTC (rev 41583)
+++ soap/trunk/tests/test_soappublication.py	2006-02-08 22:25:28 UTC (rev 41584)
@@ -35,7 +35,7 @@
 
 class TestRequest(SOAPRequest):
 
-    def __init__(self, body_instream=None, outstream=None, environ=None,
+    def __init__(self, body_instream=None, environ=None,
                  response=None, **kw):
 
         _testEnv =  {
@@ -52,11 +52,8 @@
         if body_instream is None:
             body_instream = StringIO('')
 
-        if outstream is None:
-            outstream = StringIO()
-
         super(TestRequest, self).__init__(
-            body_instream, outstream, _testEnv, response)
+            body_instream, _testEnv, response)
 
 
 class SimpleObject(object):

Modified: soap/trunk/tests/test_soaprequest.py
===================================================================
--- soap/trunk/tests/test_soaprequest.py	2006-02-08 21:02:35 UTC (rev 41583)
+++ soap/trunk/tests/test_soaprequest.py	2006-02-08 22:25:28 UTC (rev 41584)
@@ -110,17 +110,15 @@
         self.app.folder.item2 = Item2()
 
 
-    def _createRequest(self, extra_env={}, body="", outstream=None):
+    def _createRequest(self, extra_env={}, body=""):
         env = self._testEnv.copy()
         env.update(extra_env)
         if len(body):
             env['CONTENT_LENGTH'] = str(len(body))
 
         publication = Publication(self.app)
-        if outstream is None:
-            outstream = StringIO()
         instream = StringIO(body)
-        request = TestSOAPRequest(instream, outstream, env)
+        request = TestSOAPRequest(instream, env)
         request.setPublication(publication)
         return request