[Zope-Checkins] SVN: Zope/trunk/ Revert changes made in revision 65541 in favor of moving them to the blob-integration-test branch for eventual merge.

[Chris McDonough]

Log message for revision 65553:
  Revert changes made in revision 65541 in favor of moving them to the blob-integration-test branch for eventual merge. 
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/lib/python/ZPublisher/HTTPRequest.py
  U   Zope/trunk/lib/python/ZPublisher/tests/testHTTPRequest.py

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===================================================================
--- Zope/trunk/doc/CHANGES.txt	2006-02-28 00:14:38 UTC (rev 65552)
+++ Zope/trunk/doc/CHANGES.txt	2006-02-28 00:27:35 UTC (rev 65553)
@@ -26,10 +26,6 @@
 
     Restructuring
 
-      - REQUEST.processInputs now shortcuts the creation of a cgi.FieldStorage
-        object if the request is a PUT request.  This is an optimization
-        for large uploads.
-
       - deprecated the zLOG module. Use Pythons 'logging' module instead.
 
       - replaced all zLOG occurences (expect the zLOG module itself) with 

Modified: Zope/trunk/lib/python/ZPublisher/HTTPRequest.py
===================================================================
--- Zope/trunk/lib/python/ZPublisher/HTTPRequest.py	2006-02-28 00:14:38 UTC (rev 65552)
+++ Zope/trunk/lib/python/ZPublisher/HTTPRequest.py	2006-02-28 00:27:35 UTC (rev 65553)
@@ -375,15 +375,6 @@
         environ=self.environ
         method=environ.get('REQUEST_METHOD','GET')
 
-        if method == 'PUT':
-            # we don't need to do any real input processing if we are handling
-            # a PUT request because in practice, the body is never
-            # mime-encoded.  This is an optimization especially because
-            # FieldStorage creates an additional tempfile if we allow it to
-            # parse the body, and PUT uploads can tend to be large.
-            self._file = self.stdin
-            return
-
         if method != 'GET': fp=self.stdin
         else:               fp=None
 

Modified: Zope/trunk/lib/python/ZPublisher/tests/testHTTPRequest.py
===================================================================
--- Zope/trunk/lib/python/ZPublisher/tests/testHTTPRequest.py	2006-02-28 00:14:38 UTC (rev 65552)
+++ Zope/trunk/lib/python/ZPublisher/tests/testHTTPRequest.py	2006-02-28 00:27:35 UTC (rev 65553)
@@ -14,11 +14,11 @@
 
 
 class ProcessInputsTests(unittest.TestCase):
-    def _getHTTPRequest(self, env, stdin=None):
+    def _getHTTPRequest(self, env):
         from ZPublisher.HTTPRequest import HTTPRequest
-        return HTTPRequest(stdin, env, None)
+        return HTTPRequest(None, env, None)
 
-    def _processInputs(self, inputs, extraenv=None, stdin=None):
+    def _processInputs(self, inputs):
         # Have the inputs processed, and return a HTTPRequest object holding the
         # result.
         # inputs is expected to be a list of (key, value) tuples, no CGI
@@ -32,9 +32,7 @@
 
         env = {'SERVER_NAME': 'testingharnas', 'SERVER_PORT': '80'}
         env['QUERY_STRING'] = query_string
-        if extraenv is not None:
-            env.update(extraenv)
-        req = self._getHTTPRequest(env, stdin)
+        req = self._getHTTPRequest(env)
         req.processInputs()
         self._noFormValuesInOther(req)
         return req
@@ -156,15 +154,6 @@
         self._noTaintedValues(req)
         self._onlyTaintedformHoldsTaintedStrings(req)
 
-    def testPUTShortcut(self):
-        # PUT requests are not fed through cgi.FieldStorage because
-        # their bodies are never (in practice, anyway) MIME-encoded, and
-        # we don't want FieldStorage to create a separate tempfile copy for
-        # large uploads.
-        stdin = []
-        req = self._processInputs((), {'REQUEST_METHOD':'PUT'}, stdin)
-        self.assert_(req._file is stdin)
-
     def testUnicodeConversions(self):
         inputs = (('ustring:ustring:utf8', 'test\xc2\xae'),
                   ('utext:utext:utf8', 'test\xc2\xae\ntest\xc2\xae\n'),