quote_plus, unquote_plus added

compat.py: relevant imports added
utils.py: then those imports are imported here.

Nothing else was changed, but I saw mentions of quoting later in
utils.py but I wasnt sure what to do about that.

diff --git a/requests/compat.py b/requests/compat.py
index 69dd25c5b736b6145dd7ce1a55a49d46d392bfcf..90f1aaef44b0d4129b922a6cd07e2819115b1465 100644 (file)
--- a/requests/compat.py
+++ b/requests/compat.py
@@ -83,7 +83,7 @@ except ImportError:
 
 
 if is_py2:
-    from urllib import quote, unquote, urlencode
+    from urllib import quote, unquote, quote_plus, unquote_plus, urlencode
     from urlparse import urlparse, urlunparse, urljoin, urlsplit
     from urllib2 import parse_http_list
     import cookielib
@@ -104,7 +104,7 @@ if is_py2:
 
 
 elif is_py3:
-    from urllib.parse import urlparse, urlunparse, urljoin, urlsplit, urlencode, quote, unquote
+    from urllib.parse import urlparse, urlunparse, urljoin, urlsplit, urlencode, quote, unquote, quote_plus, unquote_plus
     from urllib.request import parse_http_list
     from http import cookiejar as cookielib
     from http.cookies import Morsel

diff --git a/requests/utils.py b/requests/utils.py
index f80e77822e2179f612f84bc8895277137447786b..7e9f6315fffac8624ec14818f5fe335d90e92e65 100644 (file)
--- a/requests/utils.py
+++ b/requests/utils.py
@@ -20,7 +20,7 @@ from netrc import netrc, NetrcParseError
 
 from . import __version__
 from .compat import parse_http_list as _parse_list_header
-from .compat import quote, urlparse, basestring, bytes, str, OrderedDict
+from .compat import quote, quote_plus, urlparse, basestring, bytes, str, OrderedDict
 from .cookies import RequestsCookieJar, cookiejar_from_dict
 
 _hush_pyflakes = (RequestsCookieJar,)