summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Compat.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-03-18 09:10:50 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-03-18 09:10:50 -0400
commit931705be94167075267c928b21a96bf7e73ed039 (patch)
tree53e5125845efea7bfc2275cc9055357b5736b324 /src/lib/Bcfg2/Compat.py
parenta20e35a2b3453cf959020bb40e65b9f63967b8a9 (diff)
downloadbcfg2-931705be94167075267c928b21a96bf7e73ed039.tar.gz
bcfg2-931705be94167075267c928b21a96bf7e73ed039.tar.bz2
bcfg2-931705be94167075267c928b21a96bf7e73ed039.zip
allow communication passwords with URL special chars (@, /, etc.) in them
Diffstat (limited to 'src/lib/Bcfg2/Compat.py')
-rw-r--r--src/lib/Bcfg2/Compat.py3
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