Minor simplifications in FieldStorage

Cito · Cito · commit bba08f5974d4 · 2022-03-20T10:48:23.000+01:00
diff --git a/WebUtils/FieldStorage.py b/WebUtils/FieldStorage.py
@@ -8,7 +8,7 @@
 import os
 import cgi
 
-from urllib import unquote
+from urllib import unquote_plus
 
 
 class FieldStorage(cgi.FieldStorage):
@@ -114,10 +114,10 @@ def add_qs(self, qs):
                     nv.append('')
                 else:
                     continue
-            if len(nv[1]) or keep_blank_values:
-                name = unquote(nv[0].replace('+', ' '))
+            if nv[1] or keep_blank_values:
+                name = unquote_plus(nv[0])
                 if name not in existing_names:
                     # Only append values that aren't already the FieldStorage;
                     # this makes POSTed vars override vars on the query string.
-                    value = unquote(nv[1].replace('+', ' '))
+                    value = unquote_plus(nv[1])
                     append(cgi.MiniFieldStorage(name, value))
diff --git a/WebUtils/Tests/TestFieldStorage.py b/WebUtils/Tests/TestFieldStorage.py
@@ -43,6 +43,14 @@ def testPostRequestWithBody(self):
         self.assertEqual(fs.getlist('e'), ['5', '6'])
         self.assertEqual(fs.getlist('f'), ['6'])
 
+    def testPostRequestWithSpacesInValues(self):
+        fs = FieldStorage(fp=StringIO(), environ=dict(
+            REQUEST_METHOD='POST', QUERY_STRING='a=b%20c+d'))
+        self.assertEqual(fs.getfirst('a'), 'b c d')
+        fs = FieldStorage(fp=StringIO('a=b%20c+d'), environ=dict(
+            REQUEST_METHOD='POST'))
+        self.assertEqual(fs.getfirst('a'), 'b c d')
+
     def testPostRequestOverrides(self):
         fs = FieldStorage(
             fp=StringIO('b=8&c=9&d=4&e=5&e=6&f=6'), environ=dict(
