Changeset 323

Timestamp:

06/16/05 08:03:39

Author:

rdelon

Message:

Changed file upload behavior: when a file is being uploaded, CP passes directly the cgi.FieldStorage? instance to the method, instead of reading the file in a string and passing that string. Useful attributes are: file, filename, type

Files:

• trunk/cherrypy/_cphttptools.py (modified) (2 diffs)
• trunk/cherrypy/lib/filter/decodingfilter.py (modified) (1 diff)
• trunk/cherrypy/test/helper.py (modified) (1 diff)
• trunk/cherrypy/tutorial/tut11_file_upload.py (modified) (1 diff)

trunk/cherrypy/_cphttptools.py

@@ -120 +120 @@
-        cpg.request.remoteHost = remoteHost
-        cpg.request.paramList = [] # Only used for Xml-Rpc
-        cpg.request.filenameMap = {}
-        cpg.request.fileTypeMap = {}
-        cpg.request.headerMap = {}
-        cpg.request.requestLine = requestLine
@@ -242 +240 @@
-            if isinstance(valueList, list):
-                cpg.request.paramMap[key] = []
-                cpg.request.filenameMap[key] = []
-                cpg.request.fileTypeMap[key] = []
-                for item in valueList:
-
-
-
+
-            else:
-
-
-
+
-
-

trunk/cherrypy/lib/filter/decodingfilter.py

@@ -43 +43 @@
-        enc = cpg.config.get('decodingFilter.encoding', 'utf-8')
-        for key, value in cpg.request.paramMap.items():
-cpg.request.filenameMap.get(key
+hasattr(value, 'file'
-                # This is a file being uploaded: skip it
-                continue

trunk/cherrypy/test/helper.py

@@ -56 +56 @@
-        if not port_is_free():
-            raise IOError("Port %s is in use; perhaps the previous server "
-port
+PORT
-        t = threading.Thread(target=cpg.server.start, args=(False, serverClass))
-        t.start()

trunk/cherrypy/tutorial/tut11_file_upload.py

@@ -23 +23 @@
-            myFile mime-type: %s
-        </body></html>
-
-cpg.request.filenameMap['myFile']
-cpg.request.fileTypeMap['myFile']
+.value
+myFile.filename
+myFile.type
-    upload.exposed = True
-