jprdonnelly/redash
1
0
Fork 0
mirror of https://github.com/getredash/redash.git synced 2025-12-19 17:37:19 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1395 from getredash/012patches

Browse Source 
Change: switch to requests in URL query runner
This commit is contained in:
Arik Fraimovich
2016-11-15 18:23:06 +02:00
committed by GitHub
parent 0cbbe7095d 10cbb7fd52
commit 2de4aa2a0c
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
redash/query_runner/url.py
View File

@@ -1,7 +1,5 @@
import sys import requests
import urllib2 from redash.query_runner import BaseQueryRunner, register
from redash.query_runner import *
class Url(BaseQueryRunner): class Url(BaseQueryRunner):
@@ -40,20 +38,19 @@ class Url(BaseQueryRunner):
url = base_url + query url = base_url + query
json_data = urllib2.urlopen(url).read().strip() response = requests.get(url)
response.raise_for_status()
json_data = response.content.strip()
if not json_data: if not json_data:
error = "Error reading data from '%s'" % url error = "Got empty response from '{}'.".format(url)
return json_data, error return json_data, error
except requests.RequestException as e:
except urllib2.URLError as e:
return None, str(e) return None, str(e)
except KeyboardInterrupt: except KeyboardInterrupt:
error = "Query cancelled by user." error = "Query cancelled by user."
json_data = None json_data = None
except Exception as e:
raise sys.exc_info()[1], None, sys.exc_info()[2]
return json_data, error return json_data, error