Skip to content
Snippets Groups Projects
Commit 7e849c20 authored by Becker, Benjamin's avatar Becker, Benjamin
Browse files

Merge pull request #64 in TPSH/ckanext-odsh from experimental-linked-resources-as-uploads to dev

* commit '45cb3ada':
  clears proxy after download
parents f68c5059 45cb3ada
No related branches found
No related tags found
No related merge requests found
...@@ -14,8 +14,7 @@ import urllib2 ...@@ -14,8 +14,7 @@ import urllib2
import logging import logging
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
from ckanext.odsh.setup_proxy import setup_proxy from ckanext.odsh.setup_proxy import setup_proxy, clear_proxy
setup_proxy()
def odsh_package_create(context, data_dict): def odsh_package_create(context, data_dict):
...@@ -119,7 +118,9 @@ TMP_FILE_PATH = '/tmp/temp_file_upload' ...@@ -119,7 +118,9 @@ TMP_FILE_PATH = '/tmp/temp_file_upload'
def _download_linked_resource_to_tmp(url): def _download_linked_resource_to_tmp(url):
log.debug('Downloading linked resource from {}.'.format(url)) log.debug('Downloading linked resource from {}.'.format(url))
setup_proxy()
test_file = urllib2.urlopen(url).read() test_file = urllib2.urlopen(url).read()
clear_proxy()
with open(TMP_FILE_PATH, 'wb') as temporary_file: with open(TMP_FILE_PATH, 'wb') as temporary_file:
temporary_file.write(test_file) temporary_file.write(test_file)
......
...@@ -17,3 +17,8 @@ def setup_proxy(): ...@@ -17,3 +17,8 @@ def setup_proxy():
proxy = urllib2.ProxyHandler({'http': proxy_url, 'https': proxy_url}) proxy = urllib2.ProxyHandler({'http': proxy_url, 'https': proxy_url})
opener = urllib2.build_opener(proxy) opener = urllib2.build_opener(proxy)
urllib2.install_opener(opener) 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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment