fix all occurances of B306: BaseException.message has been deprecated as of Python 2.6 and is removed in Python 3. Use str(e) to access the user-readable message. Use e.args to access arguments passed to the exception. (getredash#4482)

Omer Lachish · jezdez · commit c2f74545fb91 · 2020-02-06T00:22:24.000+01:00
diff --git a/redash/handlers/query_results.py b/redash/handlers/query_results.py
@@ -72,7 +72,7 @@ def run_query(query, parameters, data_source, query_id, max_age=0):
     try:
         query.apply(parameters)
     except (InvalidParameterError, QueryDetachedFromDataSourceError) as e:
-        abort(400, message=e.message)
+        abort(400, message=str(e))
 
     if query.missing_params:
         return error_response(
@@ -187,7 +187,7 @@ def get(self, query_id):
         try:
             return dropdown_values(query_id, self.current_org)
         except QueryDetachedFromDataSourceError as e:
-            abort(400, message=e.message)
+            abort(400, message=str(e))
 
 
 class QueryDropdownsResource(BaseResource):
diff --git a/redash/query_runner/athena.py b/redash/query_runner/athena.py
@@ -277,7 +277,7 @@ def run_query(self, query, user):
         except Exception as ex:
             if cursor.query_id:
                 cursor.cancel()
-            error = ex.message
+            error = str(ex)
             json_data = None
 
         return json_data, error
diff --git a/redash/query_runner/db2.py b/redash/query_runner/db2.py
@@ -132,7 +132,7 @@ def run_query(self, query, user):
             error = "Query interrupted. Please retry."
             json_data = None
         except ibm_db_dbi.DatabaseError as e:
-            error = e.message
+            error = str(e)
             json_data = None
         except (KeyboardInterrupt, InterruptException):
             connection.cancel()
diff --git a/redash/query_runner/dynamodb_sql.py b/redash/query_runner/dynamodb_sql.py
@@ -140,7 +140,7 @@ def run_query(self, query, user):
             )
             json_data = None
         except (SyntaxError, RuntimeError) as e:
-            error = e.message
+            error = str(e)
             json_data = None
         except KeyboardInterrupt:
             if engine and engine.connection:
diff --git a/redash/query_runner/graphite.py b/redash/query_runner/graphite.py
@@ -95,7 +95,7 @@ def run_query(self, query, user):
                 error = "Failed getting results (%d)" % response.status_code
         except Exception as ex:
             data = None
-            error = ex.message
+            error = str(ex)
 
         return data, error
 
diff --git a/redash/query_runner/impala_ds.py b/redash/query_runner/impala_ds.py
@@ -130,10 +130,10 @@ def run_query(self, query, user):
             cursor.close()
         except DatabaseError as e:
             json_data = None
-            error = e.message
+            error = str(e)
         except RPCError as e:
             json_data = None
-            error = "Metastore Error [%s]" % e.message
+            error = "Metastore Error [%s]" % str(e)
         except KeyboardInterrupt:
             connection.cancel()
             error = "Query cancelled by user."
diff --git a/redash/query_runner/influx_db.py b/redash/query_runner/influx_db.py
@@ -90,7 +90,7 @@ def run_query(self, query, user):
             error = None
         except Exception as ex:
             json_data = None
-            error = ex.message
+            error = str(ex)
 
         return json_data, error
 
diff --git a/redash/query_runner/oracle.py b/redash/query_runner/oracle.py
@@ -165,7 +165,7 @@ def run_query(self, query, user):
                 json_data = json_dumps(data)
                 connection.commit()
         except cx_Oracle.DatabaseError as err:
-            error = "Query failed. {}.".format(err.message)
+            error = "Query failed. {}.".format(str(err))
             json_data = None
         except KeyboardInterrupt:
             connection.cancel()
diff --git a/redash/query_runner/phoenix.py b/redash/query_runner/phoenix.py
@@ -110,7 +110,7 @@ def run_query(self, query, user):
         except Error as e:
             json_data = None
             error = "code: {}, sql state:{}, message: {}".format(
-                e.code, e.sqlstate, e.message
+                e.code, e.sqlstate, str(e)
             )
         except (KeyboardInterrupt, InterruptException) as e:
             error = "Query cancelled by user."
diff --git a/redash/query_runner/presto.py b/redash/query_runner/presto.py
@@ -131,9 +131,9 @@ def run_query(self, query, user):
             error = None
         except DatabaseError as db:
             json_data = None
-            default_message = "Unspecified DatabaseError: {0}".format(db.message)
-            if isinstance(db.message, dict):
-                message = db.message.get("failureInfo", {"message", None}).get(
+            default_message = "Unspecified DatabaseError: {0}".format(str(db))
+            if isinstance(db.args[0], dict):
+                message = db.args[0].get("failureInfo", {"message", None}).get(
                     "message"
                 )
             else:
@@ -145,9 +145,7 @@ def run_query(self, query, user):
             json_data = None
         except Exception as ex:
             json_data = None
-            error = ex.message
-            if not isinstance(error, str):
-                error = str(error)
+            error = str(ex)
 
         return json_data, error
 
diff --git a/redash/query_runner/script.py b/redash/query_runner/script.py
@@ -80,7 +80,7 @@ def run_query(self, query, user):
             script = query_to_script_path(self.configuration["path"], query)
             return run_script(script, self.configuration["shell"])
         except IOError as e:
-            return None, e.message
+            return None, str(e)
         except subprocess.CalledProcessError as e:
             return None, str(e)
         except KeyboardInterrupt:
diff --git a/redash/query_runner/treasuredata.py b/redash/query_runner/treasuredata.py
@@ -118,7 +118,7 @@ def run_query(self, query, user):
         except errors.InternalError as e:
             json_data = None
             error = "%s: %s" % (
-                e.message,
+                str(e),
                 cursor.show_job()
                 .get("debug", {})
                 .get("stderr", "No stderr message in the response"),

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ def run_query(self, query, user):`
`140`	`140`	`)`
`141`	`141`	`json_data = None`
`142`	`142`	`except (SyntaxError, RuntimeError) as e:`
`143`		`- error = e.message`
	`143`	`+ error = str(e)`
`144`	`144`	`json_data = None`
`145`	`145`	`except KeyboardInterrupt:`
`146`	`146`	`if engine and engine.connection:`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ def run_query(self, query, user):`
`110`	`110`	`except Error as e:`
`111`	`111`	`json_data = None`
`112`	`112`	`error = "code: {}, sql state:{}, message: {}".format(`
`113`		`- e.code, e.sqlstate, e.message`
	`113`	`+ e.code, e.sqlstate, str(e)`
`114`	`114`	`)`
`115`	`115`	`except (KeyboardInterrupt, InterruptException) as e:`
`116`	`116`	`error = "Query cancelled by user."`