diff --git a/ckanext/odsh/logic/action.py b/ckanext/odsh/logic/action.py index 019d1efc42f92a335781a6783796bfce5d405f21..8bca8dd62c81372c2059a43152b46cf29fd9414d 100644 --- a/ckanext/odsh/logic/action.py +++ b/ckanext/odsh/logic/action.py @@ -14,8 +14,7 @@ import urllib2 import logging log = logging.getLogger(__name__) -from ckanext.odsh.setup_proxy import setup_proxy -setup_proxy() +from ckanext.odsh.setup_proxy import setup_proxy, clear_proxy def odsh_package_create(context, data_dict): @@ -119,7 +118,9 @@ TMP_FILE_PATH = '/tmp/temp_file_upload' def _download_linked_resource_to_tmp(url): log.debug('Downloading linked resource from {}.'.format(url)) + setup_proxy() test_file = urllib2.urlopen(url).read() + clear_proxy() with open(TMP_FILE_PATH, 'wb') as temporary_file: temporary_file.write(test_file) diff --git a/ckanext/odsh/setup_proxy.py b/ckanext/odsh/setup_proxy.py index 6c8bb59521f9a3134ef5f375688019c1ba52de7e..13338f65a60156bf8958107746035d50d8e2c9ab 100644 --- a/ckanext/odsh/setup_proxy.py +++ b/ckanext/odsh/setup_proxy.py @@ -16,4 +16,9 @@ def setup_proxy(): if proxy_url: proxy = urllib2.ProxyHandler({'http': proxy_url, 'https': proxy_url}) opener = urllib2.build_opener(proxy) - urllib2.install_opener(opener) \ No newline at end of file + urllib2.install_opener(opener) + +def clear_proxy(): + proxy = urllib2.ProxyHandler({}) + opener = urllib2.build_opener(proxy) + urllib2.install_opener(opener) \ No newline at end of file