From: Lasse Vang Gravesen <gravesenlasse@gmail.com>
Date: Mon, 22 Oct 2012 21:58:49 +0000 (+0200)
Subject: quote_plus, unquote_plus added
X-Git-Tag: v0.14.2~4^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b36863b2c0ad2477335ff8104382965cecd6f4e9;p=services%2Fpython-requests.git

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 69dd25c..90f1aae 100644
--- 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 f80e778..7e9f631 100644
--- 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,)