Added quote_plus() and unquote_plus(), to do space/plus substitutions

for form field values.

diff --git a/Lib/urllib.py b/Lib/urllib.py
index 0644ecdd70225287a4c8f09cf8578d0637eb922e..e44f6b1435d3b70ba7eedda272eba18cb5192549 100644 (file)
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -693,6 +693,12 @@ def unquote(s):
                i = j+3
        return string.joinfields(res, '')
 
+def unquote_plus(s):
+    if '+' in s:
+       import regsub
+       s = regsub.gsub('+', ' ', s)
+    return unquote(s)
+
 always_safe = string.letters + string.digits + '_,.-'
 def quote(s, safe = '/'):
        safe = always_safe + safe
@@ -704,6 +710,14 @@ def quote(s, safe = '/'):
                        res.append('%%%02x' % ord(c))
        return string.joinfields(res, '')
 
+def quote_plus(s, safe = '/'):
+    if ' ' in s:
+       import regsub
+       s = regsub.gsub(' ', '+', s)
+       return quote(s, safe + '+')
+    else:
+       return quote(s, safe)
+
 
 # Proxy handling
 def getproxies():