Merge pull request #1427 from getredash/cass

[Cassandra] Fix: remove reference to non existing Error class
getredash · Nov 24, 2016 · b9aeb2f · b9aeb2f
2 parents 9f68dee + f3db250
commit b9aeb2f
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/redash/query_runner/cass.py b/redash/query_runner/cass.py
@@ -7,7 +7,7 @@
 logger = logging.getLogger(__name__)
 
 try:
-    from cassandra.cluster import Cluster, Error
+    from cassandra.cluster import Cluster
     from cassandra.auth import PlainTextAuthProvider
     enabled = True
 except ImportError:
@@ -85,10 +85,9 @@ def run_query(self, query, user):
             json_data = json.dumps(data, cls=JSONEncoder)
 
             error = None
-        except Error as e:
-            error = e.args[1]
         except KeyboardInterrupt:
             error = "Query cancelled by user."
+            json_data = None
 
         return json_data, error