diff -up resources-7e414c78930a81167dc2cd4d3e9adb79eeed38a6/gofedresources/retriever.py.bak resources-7e414c78930a81167dc2cd4d3e9adb79eeed38a6/gofedresources/retriever.py
--- resources-7e414c78930a81167dc2cd4d3e9adb79eeed38a6/gofedresources/retriever.py.bak 2016-10-04 08:04:48.000000000 +0200
+++ resources-7e414c78930a81167dc2cd4d3e9adb79eeed38a6/gofedresources/retriever.py 2019-03-01 18:49:01.439219234 +0100
@@ -1,4 +1,4 @@
-import urllib2
+import urllib.request, urllib.error, urllib.parse
import tempfile
from .exceptions import ResourceUnableToRetrieveError
@@ -11,15 +11,15 @@ class Retriever(object):
# TODO(jchaloup): catch exceptions: urllib2.URLError, urllib2.HTTPError
# raise ResourceNotRetrieved instead?
try:
- response = urllib2.urlopen(resource_url)
- except urllib2.URLError as err:
+ response = urllib.request.urlopen(resource_url)
+ except urllib.error.URLError as err:
# can a user do something about it?
msg = "Unable to retrieve resource, url = %s, err = %s" % (resource_url, err)
- raise urllib2.URLError(msg)
- except urllib2.HTTPError as err:
+ raise urllib.error.URLError(msg)
+ except urllib.error.HTTPError as err:
# can a user do something about it?
msg = "Unable to retrieve resource, url = %s, err = %s" % (resource_url, err)
- raise urllib2.HTTPError(msg)
+ raise urllib.error.HTTPError(msg)
try:
with tempfile.NamedTemporaryFile(delete=False) as f: