Extract unquote_plus and unquote methods, augmented with future-compatible behavior, from the unquote_qs function, which now reveals its main purpose is to change the default for errors and require an encoding.

1 files changed, 13 insertions, 6 deletions

diff --git a/cherrypy/_cpcompat.py b/cherrypy/_cpcompat.py
index f0035362..e819335f 100644
--- a/cherrypy/_cpcompat.py
+++ b/cherrypy/_cpcompat.py
@@ -97,13 +97,20 @@ def assert_native(n):
 HTTPSConnection = getattr(six.moves.http_client, 'HTTPSConnection', None)
 
 
+def _unquote_plus_compat(string, encoding='utf-8', errors='replace'):
+    return urllib.parse.unquote_plus(string).decode(encoding, errors)
+
+
+def _unquote_compat(string, encoding='utf-8', errors='replace'):
+    return urllib.parse.unquote(string).decode(encoding, errors)
+
+
+unquote_plus = urllib.parse.unquote_plus if six.PY3 else _unquote_plus_compat
+unquote = urllib.parse.unquote if six.PY3 else _unquote_compat
+
+
 def unquote_qs(atom, encoding, errors='strict'):
-    atom_spc = atom.replace('+', ' ')
-    return (
-        urllib.parse.unquote(atom_spc, encoding=encoding, errors=errors)
-        if six.PY3 else
-        urllib.parse.unquote(atom_spc).decode(encoding, errors)
-    )
+    return unquote_plus(atom, encoding, errors)
 
 
 try: