--- a/eric6/WebBrowser/SafeBrowsing/SafeBrowsingCache.py Mon Oct 05 19:51:55 2020 +0200
+++ b/eric6/WebBrowser/SafeBrowsing/SafeBrowsingCache.py Tue Oct 06 17:52:44 2020 +0200
@@ -151,21 +151,21 @@
try:
query = QSqlQuery(db)
# step 1: drop old tables
- query.exec_(self.drop_threat_list_stmt)
- query.exec_(self.drop_full_hashes_stmt)
- query.exec_(self.drop_hash_prefix_stmt)
+ query.exec(self.drop_threat_list_stmt)
+ query.exec(self.drop_full_hashes_stmt)
+ query.exec(self.drop_hash_prefix_stmt)
# step 2: drop old indices
- query.exec_(self.drop_full_hash_cue_idx)
- query.exec_(self.drop_full_hash_expires_idx)
- query.exec_(self.drop_full_hash_value_idx)
+ query.exec(self.drop_full_hash_cue_idx)
+ query.exec(self.drop_full_hash_expires_idx)
+ query.exec(self.drop_full_hash_value_idx)
# step 3: create tables
- query.exec_(self.create_threat_list_stmt)
- query.exec_(self.create_full_hashes_stmt)
- query.exec_(self.create_hash_prefix_stmt)
+ query.exec(self.create_threat_list_stmt)
+ query.exec(self.create_full_hashes_stmt)
+ query.exec(self.create_hash_prefix_stmt)
# step 4: create indices
- query.exec_(self.create_full_hash_cue_idx)
- query.exec_(self.create_full_hash_expires_idx)
- query.exec_(self.create_full_hash_value_idx)
+ query.exec(self.create_full_hash_cue_idx)
+ query.exec(self.create_full_hash_expires_idx)
+ query.exec(self.create_full_hash_value_idx)
finally:
del query
db.commit()
@@ -199,7 +199,7 @@
query.addBindValue(QByteArray(hashValue),
QSql.In | QSql.Binary)
- query.exec_()
+ query.exec()
while query.next(): # __IGNORE_WARNING_M523__
threatType = query.value(0)
@@ -244,7 +244,7 @@
for prefix in prefixes:
query.addBindValue(prefix)
- query.exec_()
+ query.exec()
while query.next(): # __IGNORE_WARNING_M523__
fullHash = bytes(query.value(0))
@@ -305,7 +305,7 @@
query.addBindValue(threatList.platformType)
query.addBindValue(threatList.threatEntryType)
query.addBindValue(malwareThreatType)
- query.exec_()
+ query.exec()
del query
query = QSqlQuery(db)
@@ -315,7 +315,7 @@
query.addBindValue(threatList.threatType)
query.addBindValue(threatList.platformType)
query.addBindValue(threatList.threatEntryType)
- query.exec_()
+ query.exec()
del query
finally:
db.commit()
@@ -341,7 +341,7 @@
query.addBindValue(threatList.threatType)
query.addBindValue(threatList.platformType)
query.addBindValue(threatList.threatEntryType)
- query.exec_()
+ query.exec()
del query
finally:
db.commit()
@@ -367,7 +367,7 @@
try:
query = QSqlQuery(db)
query.prepare(queryStr)
- query.exec_()
+ query.exec()
del query
finally:
db.commit()
@@ -405,7 +405,7 @@
query.addBindValue(threatList.threatType)
query.addBindValue(threatList.platformType)
query.addBindValue(threatList.threatEntryType)
- query.exec_()
+ query.exec()
del query
finally:
db.commit()
@@ -430,7 +430,7 @@
query = QSqlQuery(db)
query.prepare(queryStr)
- query.exec_()
+ query.exec()
while query.next(): # __IGNORE_WARNING_M523__
threatType = query.value(0)
@@ -470,7 +470,7 @@
query.addBindValue(threatList.threatType)
query.addBindValue(threatList.platformType)
query.addBindValue(threatList.threatEntryType)
- query.exec_()
+ query.exec()
del query
finally:
db.commit()
@@ -496,7 +496,7 @@
query.addBindValue(threatList.threatType)
query.addBindValue(threatList.platformType)
query.addBindValue(threatList.threatEntryType)
- query.exec_()
+ query.exec()
del query
finally:
db.commit()
@@ -525,7 +525,7 @@
query.addBindValue(threatList.threatType)
query.addBindValue(threatList.platformType)
query.addBindValue(threatList.threatEntryType)
- query.exec_()
+ query.exec()
del query
finally:
db.commit()
@@ -558,7 +558,7 @@
query.addBindValue(threatList.platformType)
query.addBindValue(threatList.threatEntryType)
- query.exec_()
+ query.exec()
while query.next(): # __IGNORE_WARNING_M523__
sha256Hash.addData(query.value(0))
@@ -601,7 +601,7 @@
query.addBindValue(threatList.threatType)
query.addBindValue(threatList.platformType)
query.addBindValue(threatList.threatEntryType)
- query.exec_()
+ query.exec()
del query
QCoreApplication.processEvents(QEventLoop.AllEvents,
self.maxProcessEventsTime)
@@ -638,7 +638,7 @@
query.addBindValue(threatList.platformType)
query.addBindValue(threatList.threatEntryType)
- query.exec_()
+ query.exec()
index = 0
while query.next(): # __IGNORE_WARNING_M523__
@@ -694,7 +694,7 @@
for prefix in removeBatch:
query.addBindValue(QByteArray(prefix),
QSql.In | QSql.Binary)
- query.exec_()
+ query.exec()
del query
QCoreApplication.processEvents(
QEventLoop.AllEvents, self.maxProcessEventsTime)
