diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2013-03-18 18:26:27 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2013-03-18 18:26:27 -0500 |
| commit | aeb0bcfe0ef10bb24bc5198ae6b281924d6ca88f (patch) | |
| tree | f83eaeea83f7710fac6cbed11b786331647644b0 /src/lib/Bcfg2/Compat.py | |
| parent | e0d8251f2b8cb315b8124d2733aaab90b9f7e2a2 (diff) | |
| parent | 4f6ba35fd86ae748d77557936e39db162cc282e3 (diff) | |
| download | bcfg2-aeb0bcfe0ef10bb24bc5198ae6b281924d6ca88f.tar.gz bcfg2-aeb0bcfe0ef10bb24bc5198ae6b281924d6ca88f.tar.bz2 bcfg2-aeb0bcfe0ef10bb24bc5198ae6b281924d6ca88f.zip | |
Merge branch 'maint'
Diffstat (limited to 'src/lib/Bcfg2/Compat.py')
| -rw-r--r-- | src/lib/Bcfg2/Compat.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Compat.py b/src/lib/Bcfg2/Compat.py index beb534791..57f96274f 100644 --- a/src/lib/Bcfg2/Compat.py +++ b/src/lib/Bcfg2/Compat.py @@ -19,12 +19,13 @@ except ImportError: # urllib imports try: + from urllib import quote_plus from urlparse import urljoin, urlparse from urllib2 import HTTPBasicAuthHandler, \ HTTPPasswordMgrWithDefaultRealm, build_opener, install_opener, \ urlopen, HTTPError, URLError except ImportError: - from urllib.parse import urljoin, urlparse + from urllib.parse import urljoin, urlparse, quote_plus from urllib.request import HTTPBasicAuthHandler, \ HTTPPasswordMgrWithDefaultRealm, build_opener, install_opener, urlopen from urllib.error import HTTPError, URLError |