diff options
| author | Nathan Olla <ollan@deshawresearch.com> | 2014-07-14 16:05:22 -0400 |
|---|---|---|
| committer | Nathan Olla <ollan@deshawresearch.com> | 2014-07-14 16:05:22 -0400 |
| commit | a9fdf3d7e73c4aabc0b5e5710617c0788b9311c8 (patch) | |
| tree | 78a18384047f4c9aa20ee9ecfb33c36809491b33 /src | |
| parent | c1e30f4bc8a03a9be535bf126e993ff45e8ab382 (diff) | |
| download | bcfg2-a9fdf3d7e73c4aabc0b5e5710617c0788b9311c8.tar.gz bcfg2-a9fdf3d7e73c4aabc0b5e5710617c0788b9311c8.tar.bz2 bcfg2-a9fdf3d7e73c4aabc0b5e5710617c0788b9311c8.zip | |
Add urlretrieve to Compat and document
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/SYSV.py | 4 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Compat.py | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/SYSV.py b/src/lib/Bcfg2/Client/Tools/SYSV.py index c17c3b712..2d835a8ae 100644 --- a/src/lib/Bcfg2/Client/Tools/SYSV.py +++ b/src/lib/Bcfg2/Client/Tools/SYSV.py @@ -4,8 +4,8 @@ import tempfile from Bcfg2.Compat import any # pylint: disable=W0622 import Bcfg2.Client.Tools import Bcfg2.Client.XML -import urllib import copy +from Bcfg2.Compat import urlretrieve # pylint: disable=C0103 @@ -62,7 +62,7 @@ class SYSV(Bcfg2.Client.Tools.PkgTool): self.tmpfiles.append(tmpfile) self.logger.debug("URL: %s/%s" % (pkg.get('url'), pkg.get('simplename'))) - urllib.urlretrieve("%s/%s" % + urlretrieve("%s/%s" % (pkg.get('url'), pkg.get('simplename')), tmpfile.name) newpkg = copy.copy(pkg) diff --git a/src/lib/Bcfg2/Compat.py b/src/lib/Bcfg2/Compat.py index 049236e03..88956e900 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: |