[Zope-Checkins] CVS: Zope3/lib/python/Zope/Publisher/HTTP - BrowserPayload.py:1.1.2.7 HTTPRequest.py:1.1.2.11

[Shane Hathaway]

Update of /cvs-repository/Zope3/lib/python/Zope/Publisher/HTTP
In directory cvs.zope.org:/tmp/cvs-serv5079/lib/python/Zope/Publisher/HTTP

Modified Files:
      Tag: Zope-3x-branch
	BrowserPayload.py HTTPRequest.py 
Log Message:
Rearranged arguments to HTTPRequest and added a simple Publisher.HTTP test.


=== Zope3/lib/python/Zope/Publisher/HTTP/BrowserPayload.py 1.1.2.6 => 1.1.2.7 ===
             if method != 'GET':
                 # Process form if not a GET request.
-                fp = request.full_instream
+                fp = request.body_instream
             else:
                 fp = None
             fs = FieldStorage(fp=fp, environ=environ, keep_blank_values=1)


=== Zope3/lib/python/Zope/Publisher/HTTP/HTTPRequest.py 1.1.2.10 => 1.1.2.11 ===
     other variables, form data, and then cookies.
     """
-    full_instream = None  # The full input stream including the body
     _auth = None          # The value of the HTTP_AUTHORIZATION header.
     _computed_urls = ()   # Names of computed URLx variables
     _script = ()          # SERVER_URL + _script + quoted_steps == full URL
@@ -94,12 +93,12 @@
 
     def retry(self):
         self.retry_count=self.retry_count+1
-        self.full_instream.seek(0)
+        self.body_instream.seek(0)
         r=self.__class__(
             payload=self._orig_payload,
-            full_instream=self.full_instream,
-            environ=self._orig_env,
-            response=self.response.retry()
+            response=self.response.retry(),
+            body_instream=self.body_instream,
+            environ=self._orig_env
             )
         r.retry_count=self.retry_count
         return r
@@ -221,11 +220,10 @@
         return self.SERVER_URL
 
 
-    def __init__(self, payload, full_instream, environ, response):
-        BaseRequest.__init__(self, response)
+    def __init__(self, payload, response, body_instream, environ):
+        BaseRequest.__init__(self, response, body_instream)
         self.payload = payload
         self._orig_payload = payload
-        self.full_instream = full_instream
         self._orig_env = environ
         environ = sane_environment(environ)