diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2014-08-26 12:37:42 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2014-08-26 12:37:42 -0500 |
| commit | 172c31a18cd6283523903dbd0da4ffe120914ae8 (patch) | |
| tree | d81c3d5ff1db92813e1603ee1e2579154db86c6e /src/lib/Bcfg2/Compat.py | |
| parent | 8738109a1491af68f753d851938b79b467291e39 (diff) | |
| parent | d5b3c70dccd23f687c8194f6ea1807092370e586 (diff) | |
| download | bcfg2-172c31a18cd6283523903dbd0da4ffe120914ae8.tar.gz bcfg2-172c31a18cd6283523903dbd0da4ffe120914ae8.tar.bz2 bcfg2-172c31a18cd6283523903dbd0da4ffe120914ae8.zip | |
Merge branch 'sysv-http' of https://github.com/nathanolla/bcfg2 into maint
Diffstat (limited to 'src/lib/Bcfg2/Compat.py')
| -rw-r--r-- | src/lib/Bcfg2/Compat.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Compat.py b/src/lib/Bcfg2/Compat.py index 049236e03..b8a75a0c5 100644 --- a/src/lib/Bcfg2/Compat.py +++ b/src/lib/Bcfg2/Compat.py @@ -20,6 +20,7 @@ except ImportError: # urllib imports try: from urllib import quote_plus + from urllib import urlretrieve from urlparse import urljoin, urlparse from urllib2 import HTTPBasicAuthHandler, \ HTTPPasswordMgrWithDefaultRealm, build_opener, install_opener, \ @@ -27,7 +28,8 @@ try: except ImportError: from urllib.parse import urljoin, urlparse, quote_plus from urllib.request import HTTPBasicAuthHandler, \ - HTTPPasswordMgrWithDefaultRealm, build_opener, install_opener, urlopen + HTTPPasswordMgrWithDefaultRealm, build_opener, install_opener, \ + urlopen, urlretrieve from urllib.error import HTTPError, URLError try: |