Skip to content

Commit c55f8b7

Browse files
jef-njef-n
committedMar 21, 2016
db_manager: cleanups
·
ltr-3_40archive/master_2
1 parent d25c253 commit c55f8b7

34 files changed

+141
-157
lines changed
 

‎python/plugins/db_manager/db_manager.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
import functools
2626

27-
from PyQt.QtCore import QObject, Qt, QSettings, QByteArray, QSize
27+
from PyQt.QtCore import Qt, QSettings, QByteArray, QSize
2828
from PyQt.QtWidgets import QMainWindow, QApplication, QMenu, QTabWidget, QGridLayout, QSpacerItem, QSizePolicy, QDockWidget, QStatusBar, QMenuBar, QToolBar, QTabBar
2929
from PyQt.QtGui import QIcon, QKeySequence
3030

@@ -214,7 +214,8 @@ def registerAction(self, action, menuName, callback=None):
214214
self._registeredDbActions = {}
215215

216216
if callback is not None:
217-
invoke_callback = lambda x: self.invokeCallback(callback)
217+
def invoke_callback(x):
218+
return self.invokeCallback(callback)
218219

219220
if menuName is None or menuName == "":
220221
self.addAction(action)

‎python/plugins/db_manager/db_manager_plugin.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
***************************************************************************/
2121
"""
2222

23-
from PyQt.QtCore import Qt, QObject
23+
from PyQt.QtCore import Qt
2424
from PyQt.QtWidgets import QAction, QApplication
2525
from PyQt.QtGui import QIcon
2626

27-
from . import resources_rc
27+
from . import resources_rc # NOQA
2828

2929

3030
class DBManagerPlugin:

‎python/plugins/db_manager/db_model.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030

3131
from qgis.core import QgsDataSourceURI, QgsVectorLayer, QgsRasterLayer, QgsMimeDataUtils
3232

33-
from . import resources_rc
33+
from . import resources_rc # NOQA
3434

3535
try:
36-
from qgis.core import QgsVectorLayerImport
36+
from qgis.core import QgsVectorLayerImport # NOQA
3737
isImportVectorAvail = True
3838
except:
3939
isImportVectorAvail = False
@@ -491,7 +491,7 @@ def _refreshIndex(self, index, force=False):
491491
else:
492492
self.notPopulated.emit(index)
493493

494-
except BaseError as e:
494+
except BaseError:
495495
item.populated = False
496496
return
497497

‎python/plugins/db_manager/db_plugins/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ def initDbPluginList():
4242
continue
4343

4444
try:
45-
exec (u"from .%s import plugin as mod" % name, globals())
45+
exec(u"from .%s import plugin as mod" % name, globals())
4646
except ImportError as e:
4747
DBPLUGIN_ERRORS.append(u"%s: %s" % (name, unicode(e)))
4848
continue
4949

50-
pluginclass = mod.classFactory()
50+
pluginclass = mod.classFactory() # NOQA
5151
SUPPORTED_DBTYPES[pluginclass.typeName()] = pluginclass
5252

5353
return len(SUPPORTED_DBTYPES) > 0

‎python/plugins/db_manager/db_plugins/connector.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def _close_cursor(self, c):
112112
if c and not c.closed:
113113
c.close()
114114

115-
except self.error_types() as e:
115+
except self.error_types():
116116
pass
117117

118118
return
@@ -168,9 +168,9 @@ def _rollback(self):
168168
def _get_cursor_columns(self, c):
169169
try:
170170
if c.description:
171-
return map(lambda x: x[0], c.description)
171+
return [x[0] for x in c.description]
172172

173-
except self.connection_error_types() + self.execution_error_types() as e:
173+
except self.connection_error_types() + self.execution_error_types():
174174
return []
175175

176176
@classmethod

‎python/plugins/db_manager/db_plugins/data_model.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ def data(self, index, role):
7878
# too much data to display, elide the string
7979
val = val[:300]
8080
try:
81-
return unicode(val) # convert to unicode
81+
return unicode(val) # convert to unicode
8282
except UnicodeDecodeError:
83-
return unicode(val, 'utf-8', 'replace') # convert from utf8 and replace errors (if any)
83+
return unicode(val, 'utf-8', 'replace') # convert from utf8 and replace errors (if any)
8484

8585
def headerData(self, section, orientation, role):
8686
if role != Qt.DisplayRole:
@@ -100,7 +100,7 @@ def __init__(self, table, parent=None):
100100
self.db = table.database().connector
101101
self.table = table
102102

103-
fieldNames = map(lambda x: x.name, table.fields())
103+
fieldNames = [x.name for x in table.fields()]
104104
BaseTableModel.__init__(self, fieldNames, None, parent)
105105

106106
# get table fields
@@ -267,7 +267,7 @@ def __init__(self, parent, editable=False):
267267
QApplication.translate("DBManagerPlugin", 'Column(s)')], editable, parent)
268268

269269
def append(self, constr):
270-
field_names = map(lambda k_v: unicode(k_v[1].name), iter(constr.fields().items()))
270+
field_names = [unicode(k_v[1].name) for k_v in iter(list(constr.fields().items()))]
271271
data = [constr.name, constr.type2String(), u", ".join(field_names)]
272272
self.appendRow(self.rowFromData(data))
273273
row = self.rowCount() - 1
@@ -303,7 +303,7 @@ def __init__(self, parent, editable=False):
303303
QApplication.translate("DBManagerPlugin", 'Column(s)')], editable, parent)
304304

305305
def append(self, idx):
306-
field_names = map(lambda k_v1: unicode(k_v1[1].name), iter(idx.fields().items()))
306+
field_names = [unicode(k_v1[1].name) for k_v1 in iter(list(idx.fields().items()))]
307307
data = [idx.name, u", ".join(field_names)]
308308
self.appendRow(self.rowFromData(data))
309309
row = self.rowCount() - 1

‎python/plugins/db_manager/db_plugins/oracle/QtSqlDB.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"""
2222

2323
from PyQt.QtCore import QVariant, QDate, QTime, QDateTime, QByteArray
24-
from PyQt4.QtSql import QSqlDatabase, QSqlQuery, QSqlField
24+
from PyQt.QtSql import QSqlDatabase, QSqlQuery, QSqlField
2525

2626
paramstyle = "qmark"
2727
threadsafety = 1

‎python/plugins/db_manager/db_plugins/oracle/connector.py

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"""
2525

2626
from PyQt.QtCore import QPyNullVariant
27-
from PyQt4.QtSql import QSqlDatabase
27+
from PyQt.QtSql import QSqlDatabase
2828

2929
from ..connector import DBConnector
3030
from ..plugin import ConnectionError, DbError, Table
@@ -101,8 +101,7 @@ def __init__(self, uri, connName):
101101
if (os.path.isfile(sqlite_cache_file)):
102102
try:
103103
self.cache_connection = sqlite3.connect(sqlite_cache_file)
104-
except sqlite3.Error as e:
105-
104+
except sqlite3.Error:
106105
self.cache_connection = False
107106

108107
# Find if there is cache for our connection:
@@ -117,7 +116,7 @@ def __init__(self, uri, connName):
117116
if not has_cached:
118117
self.cache_connection = False
119118

120-
except sqlite3.Error as e:
119+
except sqlite3.Error:
121120
self.cache_connection = False
122121

123122
self._checkSpatial()
@@ -766,7 +765,7 @@ def getTableGeomTypes(self, table, geomCol):
766765

767766
try:
768767
c = self._execute(None, query)
769-
except DbError as e: # handle error views or other problems
768+
except DbError: # handle error views or other problems
770769
return [QGis.WKBUnknown], [-1]
771770

772771
rows = self._fetchall(c)
@@ -1071,7 +1070,7 @@ def getTableExtent(self, table, geom):
10711070

10721071
try:
10731072
c = self._execute(None, sql)
1074-
except DbError as e: # no spatial index on table, try aggregation
1073+
except DbError: # no spatial index on table, try aggregation
10751074
return None
10761075

10771076
res = self._fetchone(c)
@@ -1106,7 +1105,7 @@ def getTableEstimatedExtent(self, table, geom):
11061105
sql = request.format(where, dimension)
11071106
try:
11081107
c = self._execute(None, sql)
1109-
except DbError as e: # no statistics for the current table
1108+
except DbError: # no statistics for the current table
11101109
return None
11111110

11121111
res_d = self._fetchone(c)
@@ -1160,7 +1159,7 @@ def getSpatialRefInfo(self, srid):
11601159
None,
11611160
(u"SELECT CS_NAME FROM MDSYS.CS_SRS WHERE"
11621161
u" SRID = {}".format(srid)))
1163-
except DbError as e:
1162+
except DbError:
11641163
return
11651164
sr = self._fetchone(c)
11661165
c.close()
@@ -1212,8 +1211,6 @@ def deleteTable(self, table):
12121211
"""Delete table and its reference in sdo_geom_metadata."""
12131212

12141213
schema, tablename = self.getSchemaTableName(table)
1215-
schema_part = u"AND owner = {} ".format(
1216-
self.quoteString(schema)) if schema else ""
12171214

12181215
if self.isVectorTable(table):
12191216
self.deleteMetadata(table)
@@ -1283,8 +1280,6 @@ def createSpatialView(self, view, query):
12831280
def deleteView(self, view):
12841281
"""Delete a view."""
12851282
schema, tablename = self.getSchemaTableName(view)
1286-
schema_part = u"AND owner = {} ".format(
1287-
self.quoteString(schema)) if schema else ""
12881283

12891284
if self.isVectorTable(view):
12901285
self.deleteMetadata(view)
@@ -1645,7 +1640,7 @@ def _close_cursor(self, c):
16451640
if c:
16461641
c.close()
16471642

1648-
except self.error_types() as e:
1643+
except self.error_types():
16491644
pass
16501645

16511646
return
@@ -1682,11 +1677,6 @@ def _close_cursor(self, c):
16821677
# def _get_cursor_columns(self, c):
16831678
# pass
16841679

1685-
def getQueryBuilderDictionary(self):
1686-
from .sql_dictionary import getQueryBuilderDictionary
1687-
1688-
return getQueryBuilderDictionary()
1689-
16901680
def getSqlDictionary(self):
16911681
"""Returns the dictionary for SQL dialog."""
16921682
from .sql_dictionary import getSqlDictionary

‎python/plugins/db_manager/db_plugins/oracle/info_model.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ def generalInfo(self):
219219
# primary key defined?
220220
if (not self.table.isView
221221
and self.table.objectType != u"MATERIALIZED VIEW"):
222-
pk = filter(lambda fld: fld.primaryKey, self.table.fields())
222+
pk = [fld for fld in self.table.fields() if fld.primaryKey]
223223
if len(pk) <= 0:
224224
ret.append(
225225
HtmlParagraph(QApplication.translate(

‎python/plugins/db_manager/db_plugins/oracle/plugin.py

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
from qgis.core import QgsCredentials
4040

41-
from . import resources_rc
41+
from . import resources_rc # NOQA
4242

4343

4444
def classFactory():
@@ -91,12 +91,7 @@ def connect(self, parent=None):
9191
uri = QgsDataSourceURI()
9292

9393
settingsList = ["host", "port", "database", "username", "password"]
94-
host, port, database, username, password = map(
95-
lambda x: settings.value(x, "", type=str), settingsList)
96-
97-
# qgis1.5 use 'savePassword' instead of 'save' setting
98-
savedPassword = settings.value("save", False, type=bool) or \
99-
settings.value("savePassword", False, type=bool)
94+
host, port, database, username, password = [settings.value(x, "", type=str) for x in settingsList]
10095

10196
# get all of the connexion options
10297

@@ -348,14 +343,14 @@ def runAction(self, action):
348343
QApplication.setOverrideCursor(Qt.WaitCursor)
349344

350345
if index_action == "rebuild":
351-
self.emitAboutToChange()
346+
self.aboutToChange.emit()
352347
self.database().connector.rebuildTableIndex(
353348
(self.schemaName(), self.name), index_name)
354349
self.refreshIndexes()
355350
return True
356351
elif action.startswith(u"mview/"):
357352
if action == "mview/refresh":
358-
self.emitAboutToChange()
353+
self.aboutToChange.emit()
359354
self.database().connector.refreshMView(
360355
(self.schemaName(), self.name))
361356
return True
@@ -391,7 +386,7 @@ def getValidQGisUniqueFields(self, onlyOne=False):
391386
ret = []
392387

393388
# add the pk
394-
pkcols = filter(lambda x: x.primaryKey, self.fields())
389+
pkcols = [x for x in self.fields() if x.primaryKey]
395390
if len(pkcols) == 1:
396391
ret.append(pkcols[0])
397392

@@ -452,7 +447,7 @@ def info(self):
452447
def runAction(self, action):
453448
if action.startswith("extent/"):
454449
if action == "extent/update":
455-
self.emitAboutToChange()
450+
self.aboutToChange.emit()
456451
self.updateExtent()
457452
return True
458453

‎python/plugins/db_manager/db_plugins/oracle/sql_dictionary.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,10 +289,10 @@ def getSqlDictionary(spatial=True):
289289
def getQueryBuilderDictionary():
290290
# concat functions
291291
def ff(l):
292-
return filter(lambda s: s[0] != '*', l)
292+
return [s for s in l if s[0] != '*']
293293

294294
def add_paren(l):
295-
return map(lambda s: s + "(", l)
295+
return [s + "(" for s in l]
296296

297297
foo = sorted(
298298
add_paren(

‎python/plugins/db_manager/db_plugins/plugin.py

Lines changed: 38 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def __init__(self, e):
3939
msg = e
4040

4141
if not isinstance(msg, unicode):
42-
msg = unicode(msg, 'utf-8', 'replace') # convert from utf8 and replace errors (if any)
42+
msg = unicode(msg, 'utf-8', 'replace') # convert from utf8 and replace errors (if any)
4343

4444
self.msg = msg
4545
Exception.__init__(self, msg)
@@ -198,9 +198,6 @@ def database(self):
198198
def refresh(self):
199199
self.changed.emit() # refresh the item data reading them from the db
200200

201-
def emitAboutToChange(self):
202-
self.aboutToChange.emit()
203-
204201
def info(self):
205202
pass
206203

@@ -240,7 +237,7 @@ def publicUri(self):
240237
return self.connector.publicUri()
241238

242239
def delete(self):
243-
self.emitAboutToChange()
240+
self.aboutToChange.emit()
244241
ret = self.connection().remove()
245242
if ret is not False:
246243
self.deleted.emit()
@@ -300,7 +297,7 @@ def registerSubPluginActions(self, mainWindow):
300297
except ImportError:
301298
pass
302299
else:
303-
load(self, mainWindow)
300+
load(self, mainWindow) # NOQA
304301

305302
def registerDatabaseActions(self, mainWindow):
306303
action = QAction(QApplication.translate("DBManagerPlugin", "&Re-connect"), self)
@@ -337,7 +334,10 @@ def registerDatabaseActions(self, mainWindow):
337334
if self.schemas() is not None:
338335
action = QAction(QApplication.translate("DBManagerPlugin", "&Move to schema"), self)
339336
action.setMenu(QMenu(mainWindow))
340-
invoke_callback = lambda: mainWindow.invokeCallback(self.prepareMenuMoveTableToSchemaActionSlot)
337+
338+
def invoke_callback():
339+
return mainWindow.invokeCallback(self.prepareMenuMoveTableToSchemaActionSlot)
340+
341341
action.menu().aboutToShow.connect(invoke_callback)
342342
mainWindow.registerAction(action, QApplication.translate("DBManagerPlugin", "&Table"))
343343

@@ -399,7 +399,7 @@ def schemasFactory(self, row, db):
399399
def schemas(self):
400400
schemas = self.connector.getSchemas()
401401
if schemas is not None:
402-
schemas = map(lambda x: self.schemasFactory(x, self), schemas)
402+
schemas = [self.schemasFactory(x, self) for x in schemas]
403403
return schemas
404404

405405
def createSchema(self, name):
@@ -470,7 +470,8 @@ def emptyTableActionSlot(self, item, action, parent):
470470

471471
def prepareMenuMoveTableToSchemaActionSlot(self, item, menu, mainWindow):
472472
""" populate menu with schemas """
473-
slot = lambda x: lambda: mainWindow.invokeCallback(self.moveTableToSchemaActionSlot, x)
473+
def slot(x):
474+
return lambda: mainWindow.invokeCallback(self.moveTableToSchemaActionSlot, x)
474475

475476
menu.clear()
476477
for schema in self.schemas():
@@ -508,12 +509,12 @@ def rasterTablesFactory(self, row, db, schema=None):
508509
def tables(self, schema=None, sys_tables=False):
509510
tables = self.connector.getTables(schema.name if schema else None, sys_tables)
510511
if tables is not None:
511-
tables = map(lambda x: self.tablesFactory(x, self, schema), tables)
512+
tables = [self.tablesFactory(x, self, schema) for x in tables]
512513
return tables
513514

514515
def createTable(self, table, fields, schema=None):
515-
field_defs = map(lambda x: x.definition(), fields)
516-
pkeys = filter(lambda x: x.primaryKey, fields)
516+
field_defs = [x.definition() for x in fields]
517+
pkeys = [x for x in fields if x.primaryKey]
517518
pk_name = pkeys[0].name if len(pkeys) > 0 else None
518519

519520
ret = self.connector.createTable((schema, table), field_defs, pk_name)
@@ -571,14 +572,14 @@ def tables(self):
571572
return self.database().tables(self)
572573

573574
def delete(self):
574-
self.emitAboutToChange()
575+
self.aboutToChange.emit()
575576
ret = self.database().connector.deleteSchema(self.name)
576577
if ret is not False:
577578
self.deleted.emit()
578579
return ret
579580

580581
def rename(self, new_name):
581-
self.emitAboutToChange()
582+
self.aboutToChange.emit()
582583
ret = self.database().connector.renameSchema(self.name, new_name)
583584
if ret is not False:
584585
self.name = new_name
@@ -626,7 +627,7 @@ def quotedName(self):
626627
return self.database().connector.quoteId((self.schemaName(), self.name))
627628

628629
def delete(self):
629-
self.emitAboutToChange()
630+
self.aboutToChange.emit()
630631
if self.isView:
631632
ret = self.database().connector.deleteView((self.schemaName(), self.name))
632633
else:
@@ -636,22 +637,22 @@ def delete(self):
636637
return ret
637638

638639
def rename(self, new_name):
639-
self.emitAboutToChange()
640+
self.aboutToChange.emit()
640641
ret = self.database().connector.renameTable((self.schemaName(), self.name), new_name)
641642
if ret is not False:
642643
self.name = new_name
643644
self.refresh()
644645
return ret
645646

646647
def empty(self):
647-
self.emitAboutToChange()
648+
self.aboutToChange.emit()
648649
ret = self.database().connector.emptyTable((self.schemaName(), self.name))
649650
if ret is not False:
650651
self.refreshRowCount()
651652
return ret
652653

653654
def moveToSchema(self, schema):
654-
self.emitAboutToChange()
655+
self.aboutToChange.emit()
655656
if self.schema() == schema:
656657
return True
657658
ret = self.database().connector.moveTableToSchema((self.schemaName(), self.name), schema.name)
@@ -694,7 +695,7 @@ def getValidQGisUniqueFields(self, onlyOne=False):
694695
ret = []
695696

696697
# add the pk
697-
pkcols = filter(lambda x: x.primaryKey, self.fields())
698+
pkcols = [x for x in self.fields() if x.primaryKey]
698699
if len(pkcols) == 1:
699700
ret.append(pkcols[0])
700701

@@ -726,22 +727,22 @@ def fields(self):
726727
if self._fields is None:
727728
fields = self.database().connector.getTableFields((self.schemaName(), self.name))
728729
if fields is not None:
729-
self._fields = map(lambda x: self.tableFieldsFactory(x, self), fields)
730+
self._fields = [self.tableFieldsFactory(x, self) for x in fields]
730731
return self._fields
731732

732733
def refreshFields(self):
733734
self._fields = None # refresh table fields
734735
self.refresh()
735736

736737
def addField(self, fld):
737-
self.emitAboutToChange()
738+
self.aboutToChange.emit()
738739
ret = self.database().connector.addTableColumn((self.schemaName(), self.name), fld.definition())
739740
if ret is not False:
740741
self.refreshFields()
741742
return ret
742743

743744
def deleteField(self, fld):
744-
self.emitAboutToChange()
745+
self.aboutToChange.emit()
745746
ret = self.database().connector.deleteTableColumn((self.schemaName(), self.name), fld.name)
746747
if ret is not False:
747748
self.refreshFields()
@@ -750,7 +751,7 @@ def deleteField(self, fld):
750751
return ret
751752

752753
def addGeometryColumn(self, geomCol, geomType, srid, dim, createSpatialIndex=False):
753-
self.emitAboutToChange()
754+
self.aboutToChange.emit()
754755
ret = self.database().connector.addGeometryColumn((self.schemaName(), self.name), geomCol, geomType, srid, dim)
755756
if not ret:
756757
return False
@@ -772,15 +773,15 @@ def constraints(self):
772773
if self._constraints is None:
773774
constraints = self.database().connector.getTableConstraints((self.schemaName(), self.name))
774775
if constraints is not None:
775-
self._constraints = map(lambda x: self.tableConstraintsFactory(x, self), constraints)
776+
self._constraints = [self.tableConstraintsFactory(x, self) for x in constraints]
776777
return self._constraints
777778

778779
def refreshConstraints(self):
779780
self._constraints = None # refresh table constraints
780781
self.refresh()
781782

782783
def addConstraint(self, constr):
783-
self.emitAboutToChange()
784+
self.aboutToChange.emit()
784785
if constr.type == TableConstraint.TypePrimaryKey:
785786
ret = self.database().connector.addTablePrimaryKey((self.schemaName(), self.name),
786787
constr.fields()[constr.columns[0]].name)
@@ -794,7 +795,7 @@ def addConstraint(self, constr):
794795
return ret
795796

796797
def deleteConstraint(self, constr):
797-
self.emitAboutToChange()
798+
self.aboutToChange.emit()
798799
ret = self.database().connector.deleteTableConstraint((self.schemaName(), self.name), constr.name)
799800
if ret is not False:
800801
self.refreshConstraints()
@@ -807,23 +808,23 @@ def indexes(self):
807808
if self._indexes is None:
808809
indexes = self.database().connector.getTableIndexes((self.schemaName(), self.name))
809810
if indexes is not None:
810-
self._indexes = map(lambda x: self.tableIndexesFactory(x, self), indexes)
811+
self._indexes = [self.tableIndexesFactory(x, self) for x in indexes]
811812
return self._indexes
812813

813814
def refreshIndexes(self):
814815
self._indexes = None # refresh table indexes
815816
self.refresh()
816817

817818
def addIndex(self, idx):
818-
self.emitAboutToChange()
819+
self.aboutToChange.emit()
819820
ret = self.database().connector.createTableIndex((self.schemaName(), self.name), idx.name,
820821
idx.fields()[idx.columns[0]].name)
821822
if ret is not False:
822823
self.refreshIndexes()
823824
return ret
824825

825826
def deleteIndex(self, idx):
826-
self.emitAboutToChange()
827+
self.aboutToChange.emit()
827828
ret = self.database().connector.deleteTableIndex((self.schemaName(), self.name), idx.name)
828829
if ret is not False:
829830
self.refreshIndexes()
@@ -836,7 +837,7 @@ def triggers(self):
836837
if self._triggers is None:
837838
triggers = self.database().connector.getTableTriggers((self.schemaName(), self.name))
838839
if triggers is not None:
839-
self._triggers = map(lambda x: self.tableTriggersFactory(x, self), triggers)
840+
self._triggers = [self.tableTriggersFactory(x, self) for x in triggers]
840841
return self._triggers
841842

842843
def refreshTriggers(self):
@@ -850,15 +851,15 @@ def rules(self):
850851
if self._rules is None:
851852
rules = self.database().connector.getTableRules((self.schemaName(), self.name))
852853
if rules is not None:
853-
self._rules = map(lambda x: self.tableRulesFactory(x, self), rules)
854+
self._rules = [self.tableRulesFactory(x, self) for x in rules]
854855
return self._rules
855856

856857
def refreshRules(self):
857858
self._rules = None # refresh table rules
858859
self.refresh()
859860

860861
def refreshRowCount(self):
861-
self.emitAboutToChange()
862+
self.aboutToChange.emit()
862863
prevRowCount = self.rowCount
863864
try:
864865
self.rowCount = self.database().connector.getTableRowCount((self.schemaName(), self.name))
@@ -891,7 +892,7 @@ def runAction(self, action):
891892

892893
if trigger_action == "enable" or trigger_action == "disable":
893894
enable = trigger_action == "enable"
894-
self.emitAboutToChange()
895+
self.aboutToChange.emit()
895896
self.database().connector.enableAllTableTriggers(enable, (self.schemaName(), self.name))
896897
self.refreshTriggers()
897898
return True
@@ -912,14 +913,14 @@ def runAction(self, action):
912913
QApplication.setOverrideCursor(Qt.WaitCursor)
913914

914915
if trigger_action == "delete":
915-
self.emitAboutToChange()
916+
self.aboutToChange.emit()
916917
self.database().connector.deleteTableTrigger(trigger_name, (self.schemaName(), self.name))
917918
self.refreshTriggers()
918919
return True
919920

920921
elif trigger_action == "enable" or trigger_action == "disable":
921922
enable = trigger_action == "enable"
922-
self.emitAboutToChange()
923+
self.aboutToChange.emit()
923924
self.database().connector.enableTableTrigger(trigger_name, enable, (self.schemaName(), self.name))
924925
self.refreshTriggers()
925926
return True
@@ -956,15 +957,15 @@ def hasSpatialIndex(self, geom_column=None):
956957
return False
957958

958959
def createSpatialIndex(self, geom_column=None):
959-
self.emitAboutToChange()
960+
self.aboutToChange.emit()
960961
geom_column = geom_column if geom_column is not None else self.geomColumn
961962
ret = self.database().connector.createSpatialIndex((self.schemaName(), self.name), geom_column)
962963
if ret is not False:
963964
self.refreshIndexes()
964965
return ret
965966

966967
def deleteSpatialIndex(self, geom_column=None):
967-
self.emitAboutToChange()
968+
self.aboutToChange.emit()
968969
geom_column = geom_column if geom_column is not None else self.geomColumn
969970
ret = self.database().connector.deleteSpatialIndex((self.schemaName(), self.name), geom_column)
970971
if ret is not False:

‎python/plugins/db_manager/db_plugins/postgis/connector.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ def getTableEstimatedExtent(self, table, geom):
612612

613613
try:
614614
c = self._execute(None, sql)
615-
except DbError as e: # no statistics for the current table
615+
except DbError: # No statistics for the current table
616616
return
617617
res = self._fetchone(c)
618618
self._close_cursor(c)
@@ -640,7 +640,7 @@ def getSpatialRefInfo(self, srid):
640640

641641
try:
642642
c = self._execute(None, "SELECT srtext FROM spatial_ref_sys WHERE srid = '%d'" % srid)
643-
except DbError as e:
643+
except DbError:
644644
return
645645
sr = self._fetchone(c)
646646
self._close_cursor(c)

‎python/plugins/db_manager/db_plugins/postgis/data_model.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
***************************************************************************/
2121
"""
2222

23-
from PyQt4.QtCore import SIGNAL
2423

2524
from ..data_model import TableDataModel, SqlResultModel
2625

‎python/plugins/db_manager/db_plugins/postgis/info_model.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def generalInfo(self):
106106

107107
# primary key defined?
108108
if not self.table.isView:
109-
if len(filter(lambda fld: fld.primaryKey, self.table.fields())) <= 0:
109+
if len([fld for fld in self.table.fields() if fld.primaryKey]) <= 0:
110110
ret.append(HtmlParagraph(
111111
QApplication.translate("DBManagerPlugin", "<warning> No primary key defined for this table!")))
112112

‎python/plugins/db_manager/db_plugins/postgis/plugin.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
import re
3535

36-
from . import resources_rc
36+
from . import resources_rc # NOQA
3737

3838

3939
def classFactory():
@@ -78,7 +78,7 @@ def connect(self, parent=None):
7878
uri = QgsDataSourceURI()
7979

8080
settingsList = ["service", "host", "port", "database", "username", "password", "authcfg"]
81-
service, host, port, database, username, password, authcfg = map(lambda x: settings.value(x, "", type=str), settingsList)
81+
service, host, port, database, username, password, authcfg = [settings.value(x, "", type=str) for x in settingsList]
8282

8383
useEstimatedMetadata = settings.value("estimatedMetadata", False, type=bool)
8484
sslmode = settings.value("sslmode", QgsDataSourceURI.SSLprefer, type=int)
@@ -94,7 +94,7 @@ def connect(self, parent=None):
9494

9595
try:
9696
return self.connectToUri(uri)
97-
except ConnectionError as e:
97+
except ConnectionError:
9898
return False
9999

100100

@@ -163,7 +163,7 @@ def __init__(self, row, db, schema=None):
163163
self.estimatedRowCount = int(self.estimatedRowCount)
164164

165165
def runVacuumAnalyze(self):
166-
self.emitAboutToChange()
166+
self.aboutToChange.emit()
167167
self.database().connector.runVacuumAnalyze((self.schemaName(), self.name))
168168
# TODO: change only this item, not re-create all the tables in the schema/database
169169
self.schema().refresh() if self.schema() else self.database().refresh()
@@ -193,7 +193,7 @@ def runAction(self, action):
193193
QApplication.setOverrideCursor(Qt.WaitCursor)
194194

195195
if rule_action == "delete":
196-
self.emitAboutToChange()
196+
self.aboutToChange.emit()
197197
self.database().connector.deleteTableRule(rule_name, (self.schemaName(), self.name))
198198
self.refreshRules()
199199
return True
@@ -226,12 +226,12 @@ def tableDataModel(self, parent):
226226
return PGTableDataModel(self, parent)
227227

228228
def delete(self):
229-
self.emitAboutToChange()
229+
self.aboutToChange.emit()
230230
if self.isView:
231231
ret = self.database().connector.deleteView((self.schemaName(), self.name), self._relationType == 'm')
232232
else:
233233
ret = self.database().connector.deleteTable((self.schemaName(), self.name))
234-
if ret is not False:
234+
if not ret:
235235
self.deleted.emit()
236236
return ret
237237

‎python/plugins/db_manager/db_plugins/postgis/plugins/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def load(dbplugin, mainwindow):
3131
continue
3232
try:
3333
exec (u"from .%s import load" % name)
34-
except ImportError as e:
34+
except ImportError:
3535
continue
3636

3737
load(dbplugin, mainwindow)

‎python/plugins/db_manager/db_plugins/postgis/plugins/versioning/dlg_versioning.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def populateTables(self):
8686
schemas = self.db.schemas()
8787
if schemas is not None:
8888
schema_name = self.cboSchema.currentText()
89-
matching_schemas = filter(lambda x: x.name == schema_name, schemas)
89+
matching_schemas = [x for x in schemas if x.name == schema_name]
9090
tables = matching_schemas[0].tables() if len(matching_schemas) > 0 else []
9191
else:
9292
tables = self.db.tables()
@@ -115,13 +115,13 @@ def updateSql(self):
115115
self.colStart = self.db.connector.quoteId(self.editStart.text())
116116
self.colEnd = self.db.connector.quoteId(self.editEnd.text())
117117

118-
self.columns = map(lambda x: self.db.connector.quoteId(x.name), self.table.fields())
118+
self.columns = [self.db.connector.quoteId(x.name) for x in self.table.fields()]
119119

120120
self.colOrigPkey = None
121121
for constr in self.table.constraints():
122122
if constr.type == constr.TypePrimaryKey:
123123
self.origPkeyName = self.db.connector.quoteId(constr.name)
124-
self.colOrigPkey = map(lambda x_y: self.db.connector.quoteId(x_y[1].name), iter(constr.fields().items()))
124+
self.colOrigPkey = [self.db.connector.quoteId(x_y[1].name) for x_y in iter(list(constr.fields().items()))]
125125
break
126126

127127
if self.colOrigPkey is None:
@@ -188,7 +188,7 @@ def sql_currentView(self):
188188

189189
def sql_functions(self):
190190
cols = ",".join(self.columns)
191-
old_cols = ",".join(map(lambda x: u"OLD." + x, self.columns))
191+
old_cols = ",".join([u"OLD." + x for x in self.columns])
192192

193193
sql = u"""
194194
CREATE OR REPLACE FUNCTION %(func_at_time)s(timestamp)
@@ -247,8 +247,8 @@ def sql_triggers(self):
247247

248248
def sql_updatesView(self):
249249
cols = ",".join(self.columns)
250-
new_cols = ",".join(map(lambda x: u"NEW." + x, self.columns))
251-
assign_cols = ",".join(map(lambda x: u"%s = NEW.%s" % (x, x), self.columns))
250+
new_cols = ",".join([u"NEW." + x for x in self.columns])
251+
assign_cols = ",".join([u"%s = NEW.%s" % (x, x) for x in self.columns])
252252

253253
return u"""
254254
CREATE OR REPLACE RULE "_DELETE" AS ON DELETE TO %(view)s DO INSTEAD

‎python/plugins/db_manager/db_plugins/postgis/sql_dictionary.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,10 +202,10 @@ def strip_star(s):
202202
def getQueryBuilderDictionary():
203203
# concat functions
204204
def ff(l):
205-
return filter(lambda s: s[0] != '*', l)
205+
return [s for s in l if s[0] != '*']
206206

207207
def add_paren(l):
208-
return map(lambda s: s + "(", l)
208+
return [s + "(" for s in l]
209209
foo = sorted(add_paren(ff(list(set.union(set(functions), set(postgis_functions))))))
210210
m = sorted(add_paren(ff(math_functions)))
211211
agg = sorted(add_paren(ff(aggregate_functions)))

‎python/plugins/db_manager/db_plugins/spatialite/connector.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def isValidDatabase(self, path):
6161
return False
6262
try:
6363
conn = sqlite.connect(path)
64-
except self.connection_error_types() as e:
64+
except self.connection_error_types():
6565
return False
6666
conn.close()
6767
return True
@@ -88,7 +88,7 @@ def _checkGeometryColumnsTable(self):
8888
v = c.fetchone()[0]
8989
self.has_geometry_columns = v == 1 or v == 3
9090
self.has_spatialite4 = v == 3
91-
except Exception as e:
91+
except Exception:
9292
self.has_geometry_columns = False
9393
self.has_spatialite4 = False
9494

@@ -108,7 +108,7 @@ def _checkGeopackageTables(self):
108108
result = self._execute(None, sql).fetchone()[0] == 1
109109
except ConnectionError:
110110
result = False
111-
except Exception as e:
111+
except Exception:
112112
# SpatiaLite < 4.2 does not have HasGeoPackage() function
113113
result = False
114114

@@ -325,7 +325,7 @@ def getRasterTables(self, schema=None):
325325
"""
326326

327327
if self.is_gpkg:
328-
return [] # Not implemented
328+
return [] # Not implemented
329329
if not self.has_geometry_columns:
330330
return []
331331
if not self.has_raster:
@@ -488,7 +488,7 @@ def deleteTable(self, table):
488488
if self.isRasterTable(table):
489489
return False
490490
if self.is_gpkg:
491-
return False # Not implemented
491+
return False # Not implemented
492492

493493
c = self._get_cursor()
494494
sql = u"DROP TABLE %s" % self.quoteId(table)
@@ -503,7 +503,7 @@ def emptyTable(self, table):
503503
if self.isRasterTable(table):
504504
return False
505505
if self.is_gpkg:
506-
return False # Not implemented
506+
return False # Not implemented
507507

508508
sql = u"DELETE FROM %s" % self.quoteId(table)
509509
self._execute_and_commit(sql)
@@ -517,7 +517,7 @@ def renameTable(self, table, new_table):
517517
if self.isRasterTable(table):
518518
return False
519519
if self.is_gpkg:
520-
return False # Not implemented
520+
return False # Not implemented
521521

522522
c = self._get_cursor()
523523

@@ -558,7 +558,7 @@ def renameView(self, view, new_name):
558558

559559
def createSpatialView(self, view, query):
560560
if self.is_gpkg:
561-
return False # Not implemented
561+
return False # Not implemented
562562

563563
self.createView(view, query)
564564
# get type info about the view
@@ -639,7 +639,7 @@ def setColumnNull(self, table, column, is_null):
639639

640640
def isGeometryColumn(self, table, column):
641641
if self.is_gpkg:
642-
return False # Not implemented
642+
return False # Not implemented
643643

644644
c = self._get_cursor()
645645
schema, tablename = self.getSchemaTableName(table)
@@ -650,7 +650,7 @@ def isGeometryColumn(self, table, column):
650650

651651
def addGeometryColumn(self, table, geom_column='geometry', geom_type='POINT', srid=-1, dim=2):
652652
if self.is_gpkg:
653-
return False # Not implemented
653+
return False # Not implemented
654654

655655
schema, tablename = self.getSchemaTableName(table)
656656
sql = u"SELECT AddGeometryColumn(%s, %s, %d, %s, %s)" % (
@@ -689,7 +689,7 @@ def createSpatialIndex(self, table, geom_column='geometry'):
689689
if self.isRasterTable(table):
690690
return False
691691
if self.is_gpkg:
692-
return False # Not implemented
692+
return False # Not implemented
693693

694694
schema, tablename = self.getSchemaTableName(table)
695695
sql = u"SELECT CreateSpatialIndex(%s, %s)" % (self.quoteString(tablename), self.quoteString(geom_column))
@@ -699,7 +699,7 @@ def deleteSpatialIndex(self, table, geom_column='geometry'):
699699
if self.isRasterTable(table):
700700
return False
701701
if self.is_gpkg:
702-
return False # Not implemented
702+
return False # Not implemented
703703

704704
schema, tablename = self.getSchemaTableName(table)
705705
try:
@@ -714,7 +714,7 @@ def deleteSpatialIndex(self, table, geom_column='geometry'):
714714

715715
def hasSpatialIndex(self, table, geom_column='geometry'):
716716
if self.is_gpkg:
717-
return False # Not implemented
717+
return False # Not implemented
718718
if not self.has_geometry_columns or self.isRasterTable(table):
719719
return False
720720
c = self._get_cursor()

‎python/plugins/db_manager/db_plugins/spatialite/plugin.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
from ..plugin import DBPlugin, Database, Table, VectorTable, RasterTable, TableField, TableIndex, TableTrigger, \
3333
InvalidDataException
3434

35-
from . import resources_rc
35+
from . import resources_rc # NOQA
3636

3737

3838
def classFactory():
@@ -236,14 +236,14 @@ def hasSpatialIndex(self, geom_column=None):
236236
return self.database().connector.hasSpatialIndex((self.schemaName(), self.name), geom_column)
237237

238238
def createSpatialIndex(self, geom_column=None):
239-
self.emitAboutToChange()
239+
self.aboutToChange.emit()
240240
ret = VectorTable.createSpatialIndex(self, geom_column)
241241
if ret is not False:
242242
self.database().refresh()
243243
return ret
244244

245245
def deleteSpatialIndex(self, geom_column=None):
246-
self.emitAboutToChange()
246+
self.aboutToChange.emit()
247247
ret = VectorTable.deleteSpatialIndex(self, geom_column)
248248
if ret is not False:
249249
self.database().refresh()

‎python/plugins/db_manager/db_plugins/spatialite/sql_dictionary.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,10 @@ def strip_star(s):
147147
def getQueryBuilderDictionary():
148148
# concat functions
149149
def ff(l):
150-
return filter(lambda s: s[0] != '*', l)
150+
return [s for s in l if s[0] != '*']
151151

152152
def add_paren(l):
153-
return map(lambda s: s + "(", l)
153+
return [s + "(" for s in l]
154154
foo = sorted(add_paren(ff(list(set.union(set(functions), set(spatialite_functions))))))
155155
m = sorted(add_paren(ff(math_functions)))
156156
agg = sorted(add_paren(ff(aggregate_functions)))

‎python/plugins/db_manager/db_plugins/vlayers/connector.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class VLayerRegistry:
6464

6565
@classmethod
6666
def instance(cls):
67-
if cls._instance == None:
67+
if cls._instance is None:
6868
cls._instance = VLayerRegistry()
6969
return cls._instance
7070

‎python/plugins/db_manager/db_plugins/vlayers/info_model.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def connectionDetails(self):
3636
return HtmlTable(tbl)
3737

3838
def generalInfo(self):
39-
info = self.db.connector.getInfo()
39+
self.db.connector.getInfo()
4040
tbl = [
4141
(QApplication.translate("DBManagerPlugin", "SQLite version:"), "3")
4242
]

‎python/plugins/db_manager/db_plugins/vlayers/plugin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
from ..plugin import DBPlugin, Database, Table, VectorTable, TableField
3030

31-
from . import resources_rc
31+
from . import resources_rc # NOQA
3232

3333

3434
def classFactory():

‎python/plugins/db_manager/db_plugins/vlayers/sql_dictionary.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,10 @@ def strip_star(s):
164164
def getQueryBuilderDictionary():
165165
# concat functions
166166
def ff(l):
167-
return filter(lambda s: s[0] != '*', l)
167+
return [s for s in l if s[0] != '*']
168168

169169
def add_paren(l):
170-
return map(lambda s: s + "(", l)
170+
return [s + "(" for s in l]
171171
foo = sorted(add_paren(ff(list(set.union(set(functions), set(spatialite_functions), set(qgis_functions))))))
172172
m = sorted(add_paren(ff(math_functions)))
173173
agg = sorted(add_paren(ff(aggregate_functions)))

‎python/plugins/db_manager/db_tree.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
***************************************************************************/
2121
"""
2222

23-
from PyQt.QtCore import pyqtSignal, QObject
23+
from PyQt.QtCore import pyqtSignal
2424
from PyQt.QtWidgets import QWidget, QTreeView, QMenu, QLabel
2525

26-
from qgis.core import QgsMapLayerRegistry
26+
from qgis.core import QgsMapLayerRegistry, QgsMessageLog
2727
from qgis.gui import QgsMessageBar, QgsMessageBarItem
2828

29-
from .db_model import DBModel, PluginItem, TreeItem
29+
from .db_model import DBModel, PluginItem
3030
from .db_plugins.plugin import DBPlugin, Schema, Table
3131

3232

@@ -169,10 +169,8 @@ def addLayer(self):
169169
"%1 is an invalid layer and cannot be loaded. Please check the <a href=\"#messageLog\">message log</a> for further info.").replace(
170170
"%1", layer.publicSource()), self.mainWindow.infoBar)
171171
msgLabel.setWordWrap(True)
172-
self.connect(msgLabel, SIGNAL("linkActivated( QString )"),
173-
self.mainWindow.iface.mainWindow().findChild(QWidget, "MessageLog"), SLOT("show()"))
174-
self.connect(msgLabel, SIGNAL("linkActivated( QString )"),
175-
self.mainWindow.iface.mainWindow(), SLOT("raise()"))
172+
msgLabel.linkActivated.connect(self.mainWindow.iface.mainWindow().findChild(QWidget, "MessageLog").show)
173+
msgLabel.linkActivated.connect(self.mainWindow.iface.mainWindow().raise_)
176174
self.mainWindow.infoBar.pushItem(QgsMessageBarItem(msgLabel, QgsMessageBar.WARNING))
177175

178176
def reconnect(self):

‎python/plugins/db_manager/dlg_export_vector.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
***************************************************************************/
2323
"""
2424

25-
from PyQt.QtCore import Qt, QObject, QSettings, QFileInfo
25+
from PyQt.QtCore import Qt, QSettings, QFileInfo
2626
from PyQt.QtWidgets import QDialog, QFileDialog, QMessageBox, QApplication
2727
from PyQt.QtGui import QCursor
2828

@@ -39,7 +39,7 @@ def __init__(self, inLayer, inDb, parent=None):
3939
self.db = inDb
4040
self.setupUi(self)
4141

42-
vectorFilterName = "lastVectorFileFilter" # "lastRasterFileFilter"
42+
vectorFilterName = "lastVectorFileFilter" # "lastRasterFileFilter"
4343
self.lastUsedVectorFilterSettingsKey = u"/UI/{0}".format(vectorFilterName)
4444
self.lastUsedVectorDirSettingsKey = u"/UI/{0}Dir".format(vectorFilterName)
4545

‎python/plugins/db_manager/dlg_field_properties.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
# This will get replaced with a git SHA1 when you do a git archive
2424
__revision__ = '$Format:%H$'
2525

26-
from PyQt4.QtCore import SIGNAL
2726
from PyQt.QtWidgets import QDialog, QMessageBox
2827

2928
from .db_plugins.plugin import TableField

‎python/plugins/db_manager/dlg_import_vector.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
***************************************************************************/
2323
"""
2424

25-
from PyQt.QtCore import Qt, QObject, QSettings, QFileInfo
25+
from PyQt.QtCore import Qt, QSettings, QFileInfo
2626
from PyQt.QtWidgets import QDialog, QFileDialog, QMessageBox, QApplication
2727
from PyQt.QtGui import QCursor
2828

@@ -68,9 +68,9 @@ def setupWorkingMode(self, mode):
6868

6969
if mode == self.ASK_FOR_INPUT_MODE:
7070
self.btnChooseInputFile.clicked.connect(self.chooseInputFile)
71-
# QObject.connect( self.cboInputLayer.lineEdit(), SIGNAL("editingFinished()"), self.updateInputLayer )
71+
# self.cboInputLayer.lineEdit().editingFinished.connect(self.updateInputLayer)
7272
self.cboInputLayer.editTextChanged.connect(self.inputPathChanged)
73-
# QObject.connect( self.cboInputLayer, SIGNAL("currentIndexChanged(int)"), self.updateInputLayer )
73+
# self.cboInputLayer.currentIndexChanged.connect(self.updateInputLayer)
7474
self.btnUpdateInputLayer.clicked.connect(self.updateInputLayer)
7575

7676
self.editPrimaryKey.setText(self.default_pk)
@@ -226,7 +226,7 @@ def populateTables(self):
226226
schemas = self.db.schemas()
227227
if schemas is not None:
228228
schema_name = self.cboSchema.currentText()
229-
matching_schemas = filter(lambda x: x.name == schema_name, schemas)
229+
matching_schemas = [x for x in schemas if x.name == schema_name]
230230
tables = matching_schemas[0].tables() if len(matching_schemas) > 0 else []
231231
else:
232232
tables = self.db.tables()

‎python/plugins/db_manager/dlg_query_builder.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ def add_operators(self):
184184
return
185185
ag = self.ui.operators.currentText()
186186

187-
if self.evt.focus == "where": # in where section
187+
if self.evt.focus == "where": # in where section
188188
self.ui.where.insertPlainText(ag)
189189
else:
190190
self.ui.col.insertPlainText(ag)
@@ -215,16 +215,16 @@ def add_columns(self):
215215
if self.ui.columns.currentIndex() <= 0:
216216
return
217217
ag = self.ui.columns.currentText()
218-
if self.evt.focus == "where": # in where section
219-
if ag in self.col_where: # column already called in where section
218+
if self.evt.focus == "where": # in where section
219+
if ag in self.col_where: # column already called in where section
220220
response = QMessageBox.question(self, "Column already used in WHERE clause", "Do you want to add column %s again?" % ag, QMessageBox.Yes | QMessageBox.No)
221221
if response == QMessageBox.No:
222222
self.ui.columns.setCurrentIndex(0)
223223
return
224224
self.ui.where.insertPlainText(ag)
225225
self.col_where.append(ag)
226226
elif self.evt.focus == "col":
227-
if ag in self.col_col: # column already called in col section
227+
if ag in self.col_col: # column already called in col section
228228
response = QMessageBox.question(self, "Column already used in COLUMNS section", "Do you want to add column %s again?" % ag, QMessageBox.Yes | QMessageBox.No)
229229
if response == QMessageBox.No:
230230
self.ui.columns.setCurrentIndex(0)
@@ -301,7 +301,7 @@ def use_rtree(self):
301301
tab_idx = idx.split(".")[0][1:-1] # remove "
302302
col_idx = idx.split(".")[1][1:-1] # remove '
303303
except:
304-
pop_up_error("All fields are necessary", self) # FIXME
304+
QMessageBox.warning(self, "Use R-Tree", "All fields are necessary", QMessageBox.Cancel)
305305
tgt = self.ui.table_target.currentText()
306306
if tgt in (None, "", " ", "Table (Target)"):
307307
return

‎python/plugins/db_manager/dlg_sql_window.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
from .dlg_query_builder import QueryBuilderDlg
3636

3737
try:
38-
from qgis.gui import QgsCodeEditorSQL
38+
from qgis.gui import QgsCodeEditorSQL # NOQA
3939
except:
4040
from .sqledit import SqlEdit
4141
from qgis import gui
@@ -55,8 +55,8 @@ def __init__(self, iface, db, parent=None):
5555
self.iface = iface
5656
self.db = db
5757
self.filter = ""
58-
self.allowMultiColumnPk = isinstance(db, PGDatabase) # at the moment only PostgreSQL allows a primary key to span multiple columns, spatialite doesn't
59-
self.aliasSubQuery = isinstance(db, PGDatabase) # only PostgreSQL requires subqueries to be aliases
58+
self.allowMultiColumnPk = isinstance(db, PGDatabase) # at the moment only PostgreSQL allows a primary key to span multiple columns, spatialite doesn't
59+
self.aliasSubQuery = isinstance(db, PGDatabase) # only PostgreSQL requires subqueries to be aliases
6060
self.setupUi(self)
6161
self.setWindowTitle(
6262
u"%s - %s [%s]" % (self.windowTitle(), db.connection().connectionName(), db.connection().typeNameString()))
@@ -99,8 +99,8 @@ def __init__(self, iface, db, parent=None):
9999
self.uniqueCombo.setModel(self.uniqueModel)
100100
if self.allowMultiColumnPk:
101101
self.uniqueCombo.setItemDelegate(QStyledItemDelegate())
102-
self.uniqueModel.itemChanged.connect(self.uniqueChanged) # react to the (un)checking of an item
103-
self.uniqueCombo.lineEdit().textChanged.connect(self.uniqueTextChanged) # there are other events that change the displayed text and some of them can not be caught directly
102+
self.uniqueModel.itemChanged.connect(self.uniqueChanged) # react to the (un)checking of an item
103+
self.uniqueCombo.lineEdit().textChanged.connect(self.uniqueTextChanged) # there are other events that change the displayed text and some of them can not be caught directly
104104

105105
# hide the load query as layer if feature is not supported
106106
self._loadAsLayerAvailable = self.db.connector.hasCustomQuerySupport()
@@ -269,7 +269,7 @@ def loadSqlLayer(self):
269269
QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
270270
try:
271271
layer = self._getSqlLayer(self.filter)
272-
if layer == None:
272+
if layer is None:
273273
return
274274

275275
from qgis.core import QgsMapLayerRegistry

‎python/plugins/db_manager/layer_preview.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ def loadPreview(self, item):
6363

6464
if isinstance(item, Table) and item.type in [Table.VectorType, Table.RasterType]:
6565
# update the preview, but first let the manager chance to show the canvas
66-
runPrev = lambda: self._loadTablePreview(item)
66+
def runPrev():
67+
return self._loadTablePreview(item)
6768
QTimer.singleShot(50, runPrev)
6869
else:
6970
return

‎python/plugins/db_manager/table_viewer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
***************************************************************************/
2121
"""
2222

23-
from PyQt.QtCore import Qt, QObject
23+
from PyQt.QtCore import Qt
2424
from PyQt.QtWidgets import QTableView, QAbstractItemView, QApplication, QAction
2525
from PyQt.QtGui import QKeySequence, QCursor, QClipboard
2626

0 commit comments

Comments
 (0)
Please sign in to comment.