diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-06-19 11:24:00 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-06-19 11:24:00 -0400 |
| commit | 869934179f21858b10d4de60d11d3644afcfad74 (patch) | |
| tree | 071cfc8f44fbb5048404acf2ccec198f11399274 /src/lib/Bcfg2/Bcfg2Py3k.py | |
| parent | e3131034dd00c61ed5ca4f6a38f74250f0ac5726 (diff) | |
| parent | 16a38827b5bb374da6caaf103f9363a45262f745 (diff) | |
| download | bcfg2-869934179f21858b10d4de60d11d3644afcfad74.tar.gz bcfg2-869934179f21858b10d4de60d11d3644afcfad74.tar.bz2 bcfg2-869934179f21858b10d4de60d11d3644afcfad74.zip | |
merged maint
Diffstat (limited to 'src/lib/Bcfg2/Bcfg2Py3k.py')
| -rw-r--r-- | src/lib/Bcfg2/Bcfg2Py3k.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Bcfg2Py3k.py b/src/lib/Bcfg2/Bcfg2Py3k.py index 5b74d4225..30feaf8c5 100644 --- a/src/lib/Bcfg2/Bcfg2Py3k.py +++ b/src/lib/Bcfg2/Bcfg2Py3k.py @@ -14,6 +14,7 @@ try: from urllib2 import install_opener from urllib2 import urlopen from urllib2 import HTTPError + from urllib2 import URLError except ImportError: from urllib.parse import urljoin, urlparse from urllib.request import HTTPBasicAuthHandler @@ -22,6 +23,7 @@ except ImportError: from urllib.request import install_opener from urllib.request import urlopen from urllib.error import HTTPError + from urllib.error import URLError try: from cStringIO import StringIO |