Some more preparing for 2to3 (keys() is iter in 3)

This commit is contained in:
Miroslav Stampar
2019-01-22 03:00:44 +01:00
parent 1adc66b763
commit 8f13bda035
14 changed files with 37 additions and 37 deletions

View File

@@ -415,7 +415,7 @@ class Databases:
kb.data.cachedTables[db] = sorted(tables) if tables else tables
if kb.data.cachedTables:
for db in kb.data.cachedTables.keys():
for db in kb.data.cachedTables:
kb.data.cachedTables[db] = list(set(kb.data.cachedTables[db]))
return kb.data.cachedTables

View File

@@ -517,7 +517,7 @@ class Entries:
choice = readInput(message, default='a')
if not choice or choice in ('a', 'A'):
dumpFromDbs = dbs.keys()
dumpFromDbs = list(dbs.keys())
elif choice in ('q', 'Q'):
return
else:
@@ -584,7 +584,7 @@ class Entries:
choice = readInput(message, default='a')
if not choice or choice.lower() == 'a':
dumpFromDbs = tables.keys()
dumpFromDbs = list(tables.keys())
elif choice.lower() == 'q':
return
else:

View File

@@ -273,7 +273,7 @@ class Search:
dbName = "SQLite" if Backend.isDbms(DBMS.SQLITE) else "Firebird"
foundTbls["%s%s" % (dbName, METADB_SUFFIX)] = []
for db in foundTbls.keys():
for db in foundTbls:
db = safeSQLIdentificatorNaming(db)
infoMsg = "fetching number of table"
@@ -326,7 +326,7 @@ class Search:
foundTbl = safeSQLIdentificatorNaming(foundTbl, True)
foundTbls[db].append(foundTbl)
for db in foundTbls.keys():
for db in list(foundTbls.keys()):
if isNoneValue(foundTbls[db]):
del foundTbls[db]