From 45cb3ada293e13fdef55d69a91f9d93041752415 Mon Sep 17 00:00:00 2001
From: Benjamin Becker <benjamin.becker@dataport.de>
Date: Tue, 17 Dec 2019 12:38:59 +0000
Subject: [PATCH] clears proxy after download
---
ckanext/odsh/logic/action.py | 5 +++--
ckanext/odsh/setup_proxy.py | 7 ++++++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ckanext/odsh/logic/action.py b/ckanext/odsh/logic/action.py
index 019d1efc..8bca8dd6 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 6c8bb595..13338f65 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
--
GitLab