Mercurial Repositories > Eric Assistant / changeset
changeset
Changed calls to exec_() into exec() (remainder of Python2 elimination).
Wed, 07 Oct 2020 19:23:20 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Wed, 07 Oct 2020 19:23:20 +0200
- changeset 165
- c918fe25c97f
- parent 164
- 2b230bd8ab53
- child 166
- 7b780f81d0de
Changed calls to exec_() into exec() (remainder of Python2 elimination).
--- a/AssistantEric/APIsManager.py Mon Jun 22 19:16:29 2020 +0200 +++ b/AssistantEric/APIsManager.py Wed Oct 07 19:23:20 2020 +0200 @@ -165,7 +165,7 @@ query = QSqlQuery(db) query.prepare(self.file_loaded_stmt) query.bindValue(":file", apiFile) - query.exec_() + query.exec() if query.next() and query.isValid(): # __IGNORE_WARNING_M513__ loadTime = QDateTime.fromString(query.value(0), Qt.ISODate) else: @@ -288,13 +288,13 @@ # step 1: create entry in file table query.prepare(self.populate_file_stmt) query.bindValue(":file", apiFile) - query.exec_() + query.exec() # step 2: update the file entry query.prepare(self.update_file_stmt) query.bindValue(":lastRead", QDateTime.currentDateTime()) query.bindValue(":file", apiFile) - query.exec_() + query.exec() finally: query.finish() del query @@ -323,11 +323,11 @@ # step 1: create entry in file table and get the ID query.prepare(self.populate_file_stmt) query.bindValue(":file", apiFile) - if not query.exec_(): + if not query.exec(): return query.prepare(self.file_id_stmt) query.bindValue(":file", apiFile) - if not query.exec_(): + if not query.exec(): return if not query.next(): # __IGNORE_WARNING_M513__ return @@ -336,11 +336,11 @@ # step 2: delete all entries belonging to this file query.prepare(self.populate_del_api_stmt) query.bindValue(":fileId", fileId) - query.exec_() + query.exec() query.prepare(self.populate_del_bases_stmt) query.bindValue(":fileId", fileId) - query.exec_() + query.exec() # step 3: load the given API info query.prepare(self.populate_api_stmt) @@ -401,7 +401,7 @@ query.bindValue(":signature", sig) query.bindValue(":fileId", fileId) query.bindValue(":pictureId", pictureId) - query.exec_() + query.exec() sig = "" @@ -419,14 +419,14 @@ query.bindValue(":class", class_) query.bindValue(":baseClasses", baseClasses) query.bindValue(":fileId", fileId) - query.exec_() + query.exec() if not self.__aborted: # step 5: update the file entry query.prepare(self.update_file_stmt) query.bindValue(":lastRead", QDateTime.currentDateTime()) query.bindValue(":file", apiFile) - query.exec_() + query.exec() finally: query.finish() del query @@ -449,24 +449,24 @@ # step 1: get the ID belonging to the api file query.prepare(self.file_id_stmt) query.bindValue(":file", apiFile) - query.exec_() + query.exec() query.next() # __IGNORE_WARNING_M513__ fileId = int(query.value(0)) # step 2: delete all API entries belonging to this file query.prepare(self.populate_del_api_stmt) query.bindValue(":fileId", fileId) - query.exec_() + query.exec() # step 3: delete all base classes entries belonging to this file query.prepare(self.populate_del_bases_stmt) query.bindValue(":fileId", fileId) - query.exec_() + query.exec() # step 4: delete the file entry query.prepare(self.file_delete_id_stmt) query.bindValue(":id", fileId) - query.exec_() + query.exec() finally: query.finish() del query @@ -485,7 +485,7 @@ db.transaction() try: query = QSqlQuery(db) - query.exec_(self.api_files_stmt) + query.exec(self.api_files_stmt) while query.next(): # __IGNORE_WARNING_M513__ apiFiles.append(query.value(0)) finally: @@ -786,28 +786,28 @@ try: query = QSqlQuery(db) # step 1: drop old tables - query.exec_(self.drop_mgmt_stmt) - query.exec_(self.drop_api_stmt) - query.exec_(self.drop_bases_stmt) - query.exec_(self.drop_file_stmt) + query.exec(self.drop_mgmt_stmt) + query.exec(self.drop_api_stmt) + query.exec(self.drop_bases_stmt) + query.exec(self.drop_file_stmt) # step 2: drop old indices - query.exec_(self.drop_acWord_idx) - query.exec_(self.drop_context_idx) - query.exec_(self.drop_fullContext_idx) - query.exec_(self.drop_bases_idx) - query.exec_(self.drop_file_idx) + query.exec(self.drop_acWord_idx) + query.exec(self.drop_context_idx) + query.exec(self.drop_fullContext_idx) + query.exec(self.drop_bases_idx) + query.exec(self.drop_file_idx) # step 3: create tables - query.exec_(self.create_api_stmt) - query.exec_(self.create_bases_stmt) - query.exec_(self.create_file_stmt) - query.exec_(self.create_mgmt_stmt) - query.exec_(self.mgmt_insert_stmt) + query.exec(self.create_api_stmt) + query.exec(self.create_bases_stmt) + query.exec(self.create_file_stmt) + query.exec(self.create_mgmt_stmt) + query.exec(self.mgmt_insert_stmt) # step 4: create indices - query.exec_(self.create_acWord_idx) - query.exec_(self.create_context_idx) - query.exec_(self.create_fullContext_idx) - query.exec_(self.create_bases_idx) - query.exec_(self.create_file_idx) + query.exec(self.create_acWord_idx) + query.exec(self.create_context_idx) + query.exec(self.create_fullContext_idx) + query.exec(self.create_bases_idx) + query.exec(self.create_file_idx) finally: query.finish() del query @@ -825,7 +825,7 @@ db.transaction() try: query = QSqlQuery(db) - query.exec_(self.api_files_stmt) + query.exec(self.api_files_stmt) while query.next(): # __IGNORE_WARNING_M513__ apiFiles.append(query.value(0)) finally: @@ -848,7 +848,7 @@ prepared = False try: query = QSqlQuery(db) - ok = query.exec_(self.format_select_stmt) + ok = query.exec(self.format_select_stmt) if ok: query.next() # __IGNORE_WARNING_M513__ formatVersion = int(query.value(0)) @@ -898,7 +898,7 @@ query.bindValue(":context", context) if query is not None: - query.exec_() + query.exec() while query.next(): # __IGNORE_WARNING_M513__ completions.append({"completion": query.value(0), "context": query.value(1), @@ -912,7 +912,7 @@ query = QSqlQuery(db) query.prepare(self.bases_stmt) query.bindValue(":class", context) - query.exec_() + query.exec() if query.next(): # __IGNORE_WARNING_M513__ bases = query.value(0).split() else: @@ -961,7 +961,7 @@ else: query.prepare(self.ct_stmt) query.bindValue(":acWord", acWord) - query.exec_() + query.exec() while query.next(): # __IGNORE_WARNING_M513__ word = query.value(0) sig = query.value(1) @@ -989,7 +989,7 @@ query = QSqlQuery(db) query.prepare(self.bases_stmt) query.bindValue(":class", context) - query.exec_() + query.exec() if query.next(): # __IGNORE_WARNING_M513__ bases = query.value(0).split() else:
--- a/PluginAssistantEric.py Mon Jun 22 19:16:29 2020 +0200 +++ b/PluginAssistantEric.py Wed Oct 07 19:23:20 2020 +0200 @@ -24,7 +24,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = True deactivateable = True -version = "5.0.0" +version = "5.1.0" className = "AssistantEricPlugin" packageName = "AssistantEric" shortDescription = "Alternative autocompletion and calltips provider."
