From 10cbb7fd52c3f6a2f1fa4b6d5bebdfa281f18990 Mon Sep 17 00:00:00 2001
From: Arik Fraimovich <arik@arikfr.com>
Date: Tue, 15 Nov 2016 18:19:44 +0200
Subject: [PATCH] Change: switch to requests in URL query runner

---
 redash/query_runner/url.py | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/redash/query_runner/url.py b/redash/query_runner/url.py
index 434fc1606..8763b63ed 100644
--- a/redash/query_runner/url.py
+++ b/redash/query_runner/url.py
@@ -1,7 +1,5 @@
-import sys
-import urllib2
-
-from redash.query_runner import *
+import requests
+from redash.query_runner import BaseQueryRunner, register
 
 
 class Url(BaseQueryRunner):
@@ -40,20 +38,19 @@ class Url(BaseQueryRunner):
 
             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:
-                error = "Error reading data from '%s'" % url
+                error = "Got empty response from '{}'.".format(url)
 
             return json_data, error
-
-        except urllib2.URLError as e:
+        except requests.RequestException as e:
             return None, str(e)
         except KeyboardInterrupt:
             error = "Query cancelled by user."
             json_data = None
-        except Exception as e:
-            raise sys.exc_info()[1], None, sys.exc_info()[2]
 
         return json_data, error