From c8b447daec7f5809f7af5bb7a476b9a1bf5f94b5 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 12 Sep 2018 01:31:41 +0200 Subject: [PATCH] Clean up raise_sqlite_error --- qutebrowser/misc/sql.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/qutebrowser/misc/sql.py b/qutebrowser/misc/sql.py index 8053e5151..60171a326 100644 --- a/qutebrowser/misc/sql.py +++ b/qutebrowser/misc/sql.py @@ -86,12 +86,16 @@ class SqlBugError(SqlError): def raise_sqlite_error(msg, error): """Raise either a SqlBugError or SqlEnvironmentError.""" + error_code = error.nativeErrorCode() + database_text = error.databaseText() + log.sql.debug("SQL error:") log.sql.debug("type: {}".format( debug.qenum_key(QSqlError, error.type()))) - log.sql.debug("database text: {}".format(error.databaseText())) + log.sql.debug("database text: {}".format(database_text)) log.sql.debug("driver text: {}".format(error.driverText())) - log.sql.debug("error code: {}".format(error.nativeErrorCode())) + log.sql.debug("error code: {}".format(error_code)) + environmental_errors = [ SqliteErrorCode.BUSY, SqliteErrorCode.READONLY, @@ -108,9 +112,9 @@ def raise_sqlite_error(msg, error): environmental_strings = [ "out of memory", ] - errcode = error.nativeErrorCode() - if (errcode in environmental_errors or - (errcode == -1 and error.databaseText() in environmental_strings)): + + if (error_code in environmental_errors or + (error_code == -1 and database_text in environmental_strings)): raise SqlEnvironmentError(msg, error) else: raise SqlBugError(msg, error)