rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up raise_sqlite_error

Browse Source
This commit is contained in:
Florian Bruhin 2018-09-12 01:31:41 +02:00
parent 941be6faed
commit c8b447daec
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qutebrowser/misc/sql.py
View File

@ -86,12 +86,16 @@ class SqlBugError(SqlError):
def raise_sqlite_error(msg, error): def raise_sqlite_error(msg, error):
"""Raise either a SqlBugError or SqlEnvironmentError.""" """Raise either a SqlBugError or SqlEnvironmentError."""
error_code = error.nativeErrorCode()
database_text = error.databaseText()
log.sql.debug("SQL error:") log.sql.debug("SQL error:")
log.sql.debug("type: {}".format( log.sql.debug("type: {}".format(
debug.qenum_key(QSqlError, error.type()))) 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("driver text: {}".format(error.driverText()))
log.sql.debug("error code: {}".format(error.nativeErrorCode())) log.sql.debug("error code: {}".format(error_code))
environmental_errors = [ environmental_errors = [
SqliteErrorCode.BUSY, SqliteErrorCode.BUSY,
SqliteErrorCode.READONLY, SqliteErrorCode.READONLY,
@ -108,9 +112,9 @@ def raise_sqlite_error(msg, error):
environmental_strings = [ environmental_strings = [
"out of memory", "out of memory",
] ]
errcode = error.nativeErrorCode()
if (errcode in environmental_errors or if (error_code in environmental_errors or
(errcode == -1 and error.databaseText() in environmental_strings)): (error_code == -1 and database_text in environmental_strings)):
raise SqlEnvironmentError(msg, error) raise SqlEnvironmentError(msg, error)
else: else:
raise SqlBugError(msg, error) raise SqlBugError(msg, error)