Ticket #1340: diff

/home/noam/lib/python/CherryPy-2.2.1-py2.5.egg/cherrypy/filters/decodingfilter.py

@@ -38 +38 @@
-    
-    def decode(self, enc):
-        decodedParams = {}
+        def strdecode(s, enc):
+            if isinstance(s, unicode):
+                return s
+            else:
+                return s.decode(enc)
-        for key, value in cherrypy.request.params.items():
-            if hasattr(value, 'file'):
-                # This is a file being uploaded: skip it
-                decodedParams[key] = value
-            elif isinstance(value, list):
-                # value is a list: decode each element
-v.decode(
+strdecode(v, 
-            else:
-                # value is a regular string: decode it
-value.decode(
+strdecode(value, 
-        
-        # Decode all or nothing, so we can try again on error.
-        cherrypy.request.params = decodedParams