From ac9c6f1e18624b6e2d1fac4d27811ace7a92afe0 Mon Sep 17 00:00:00 2001 From: Etienne Trimaille Date: Mon, 4 Feb 2019 18:53:04 -0400 Subject: [PATCH] some minor code cleanup in dbmanager --- python/plugins/db_manager/dlg_import_vector.py | 3 +-- python/plugins/db_manager/dlg_sql_layer_window.py | 9 +-------- python/plugins/db_manager/dlg_sql_window.py | 12 ++---------- 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/python/plugins/db_manager/dlg_import_vector.py b/python/plugins/db_manager/dlg_import_vector.py index 82076b8614c..5c70ef22658 100644 --- a/python/plugins/db_manager/dlg_import_vector.py +++ b/python/plugins/db_manager/dlg_import_vector.py @@ -25,8 +25,7 @@ from builtins import str from builtins import range from qgis.PyQt.QtCore import Qt, QFileInfo -from qgis.PyQt.QtWidgets import QDialog, QFileDialog, QMessageBox, QApplication -from qgis.PyQt.QtGui import QCursor +from qgis.PyQt.QtWidgets import QDialog, QFileDialog, QMessageBox from qgis.core import (QgsDataSourceUri, QgsVectorLayer, diff --git a/python/plugins/db_manager/dlg_sql_layer_window.py b/python/plugins/db_manager/dlg_sql_layer_window.py index 844a6279035..1997f19aca6 100644 --- a/python/plugins/db_manager/dlg_sql_layer_window.py +++ b/python/plugins/db_manager/dlg_sql_layer_window.py @@ -88,7 +88,7 @@ class DlgSqlLayerWindow(QWidget, Ui_Dialog): self.setWindowTitle( u"%s - %s [%s]" % (self.windowTitle(), db.connection().connectionName(), db.connection().typeNameString())) - self.defaultLayerName = 'QueryLayer' + self.defaultLayerName = self.tr('QueryLayer') if self.allowMultiColumnPk: self.uniqueColumnCheck.setText(self.tr("Column(s) with unique values")) @@ -230,7 +230,6 @@ class DlgSqlLayerWindow(QWidget, Ui_Dialog): def loadPreset(self, name): query = QgsProject.instance().readEntry('DBManager', 'savedQueries/' + self.getQueryHash(name) + '/query')[0] - name = QgsProject.instance().readEntry('DBManager', 'savedQueries/' + self.getQueryHash(name) + '/name')[0] self.editSql.setText(query) def clearSql(self): @@ -252,7 +251,6 @@ class DlgSqlLayerWindow(QWidget, Ui_Dialog): if old_model: old_model.deleteLater() - cols = [] quotedCols = [] try: @@ -368,7 +366,6 @@ class DlgSqlLayerWindow(QWidget, Ui_Dialog): query = query.strip()[:-1] # get all the columns - cols = [] quotedCols = [] connector = self.db.connector if self.aliasSubQuery: @@ -462,10 +459,6 @@ class DlgSqlLayerWindow(QWidget, Ui_Dialog): items[0].setCheckState(Qt.Checked) else: self.uniqueCombo.setEditText(defaultUniqueCol) - try: - pass - except: - pass def copySelectedResults(self): if len(self.viewResult.selectedIndexes()) <= 0: diff --git a/python/plugins/db_manager/dlg_sql_window.py b/python/plugins/db_manager/dlg_sql_window.py index fab5c077e11..41ff1180ebe 100644 --- a/python/plugins/db_manager/dlg_sql_window.py +++ b/python/plugins/db_manager/dlg_sql_window.py @@ -73,7 +73,7 @@ class DlgSqlWindow(QWidget, Ui_Dialog): self.setWindowTitle( self.tr(u"{0} - {1} [{2}]").format(self.windowTitle(), self.connectionName, self.dbType)) - self.defaultLayerName = 'QueryLayer' + self.defaultLayerName = self.tr('QueryLayer') if self.allowMultiColumnPk: self.uniqueColumnCheck.setText(self.tr("Column(s) with unique values")) @@ -277,7 +277,6 @@ class DlgSqlWindow(QWidget, Ui_Dialog): def loadPreset(self, name): query = QgsProject.instance().readEntry('DBManager', 'savedQueries/' + self.getQueryHash(name) + '/query')[0] - name = QgsProject.instance().readEntry('DBManager', 'savedQueries/' + self.getQueryHash(name) + '/name')[0] self.editSql.setText(query) def loadAsLayerToggled(self, checked): @@ -334,7 +333,6 @@ class DlgSqlWindow(QWidget, Ui_Dialog): with OverrideCursor(Qt.WaitCursor): if self.modelAsync.task.status() == QgsTask.Complete: model = self.modelAsync.model - cols = [] quotedCols = [] self.viewResult.setModel(model) @@ -351,7 +349,6 @@ class DlgSqlWindow(QWidget, Ui_Dialog): DlgDbError.showError(self.modelAsync.error, self) self.uniqueModel.clear() self.geomCombo.clear() - pass def executeSql(self): @@ -452,7 +449,6 @@ class DlgSqlWindow(QWidget, Ui_Dialog): query = query.strip()[:-1] # get all the columns - cols = [] quotedCols = [] connector = self.db.connector if self.aliasSubQuery: @@ -546,10 +542,6 @@ class DlgSqlWindow(QWidget, Ui_Dialog): items[0].setCheckState(Qt.Checked) else: self.uniqueCombo.setEditText(defaultUniqueCol) - try: - pass - except: - pass def copySelectedResults(self): if len(self.viewResult.selectedIndexes()) <= 0: @@ -575,7 +567,7 @@ class DlgSqlWindow(QWidget, Ui_Dialog): dictionary = getSqlDictionary() wordlist = [] - for _, value in dictionary.items(): + for value in dictionary.values(): wordlist += value # concat lists wordlist = list(set(wordlist)) # remove duplicates