diff -r 4f2dd0850803 -r b047181a4a33 UI/BrowserModel.py
--- a/UI/BrowserModel.py Sat Mar 11 14:35:22 2017 +0100
+++ b/UI/BrowserModel.py Sat Mar 11 18:08:42 2017 +0100
@@ -300,17 +300,18 @@
return
if Preferences.getUI("BrowsersListHiddenFiles"):
- filter = QDir.Filters(
+ dirFilter = QDir.Filters(
QDir.AllEntries | QDir.Hidden | QDir.NoDotAndDotDot)
else:
- filter = QDir.Filters(QDir.AllEntries | QDir.NoDot | QDir.NoDotDot)
+ dirFilter = QDir.Filters(
+ QDir.AllEntries | QDir.NoDot | QDir.NoDotDot)
for itm in self.watchedItems[path]:
oldCnt = itm.childCount()
qdir = QDir(itm.dirName())
- entryInfoList = qdir.entryInfoList(filter)
+ entryInfoList = qdir.entryInfoList(dirFilter)
# step 1: check for new entries
children = itm.children()
@@ -531,11 +532,12 @@
qdir = QDir(parentItem.dirName())
if Preferences.getUI("BrowsersListHiddenFiles"):
- filter = QDir.Filters(
+ dirFilter = QDir.Filters(
QDir.AllEntries | QDir.Hidden | QDir.NoDotAndDotDot)
else:
- filter = QDir.Filters(QDir.AllEntries | QDir.NoDot | QDir.NoDotDot)
- entryInfoList = qdir.entryInfoList(filter)
+ dirFilter = QDir.Filters(
+ QDir.AllEntries | QDir.NoDot | QDir.NoDotDot)
+ entryInfoList = qdir.entryInfoList(dirFilter)
if len(entryInfoList) > 0:
if repopulate:
self.beginInsertRows(
@@ -552,8 +554,8 @@
Preferences.getUI("BrowsersFileFilters").split(";")
if fileFilters:
fn = f.fileName()
- if any([fnmatch.fnmatch(fn, ff.strip())
- for ff in fileFilters]):
+ if any(fnmatch.fnmatch(fn, ff.strip())
+ for ff in fileFilters):
continue
node = BrowserFileItem(
parentItem,
@@ -606,13 +608,13 @@
moduleName = parentItem.moduleName()
fileName = parentItem.fileName()
try:
- dict = Utilities.ClassBrowsers.readmodule(
+ dictionary = Utilities.ClassBrowsers.readmodule(
moduleName, [parentItem.dirName()],
parentItem.isPython2File() or parentItem.isPython3File())
except ImportError:
return
- keys = list(dict.keys())
+ keys = list(dictionary.keys())
if len(keys) > 0:
if repopulate:
self.beginInsertRows(
@@ -622,7 +624,7 @@
if key.startswith("@@"):
# special treatment done later
continue
- cl = dict[key]
+ cl = dictionary[key]
try:
if cl.module == moduleName:
node = BrowserClassItem(parentItem, cl, fileName)
@@ -633,12 +635,12 @@
node = BrowserCodingItem(
parentItem,
QCoreApplication.translate("BrowserModel", "Coding: {0}")
- .format(dict["@@Coding@@"].coding))
+ .format(dictionary["@@Coding@@"].coding))
self._addItem(node, parentItem)
if "@@Globals@@" in keys:
node = BrowserGlobalsItem(
parentItem,
- dict["@@Globals@@"].globals,
+ dictionary["@@Globals@@"].globals,
QCoreApplication.translate("BrowserModel", "Globals"))
self._addItem(node, parentItem)
if "@@Import@@" in keys or "@@ImportFrom@@" in keys:
@@ -648,7 +650,7 @@
self._addItem(node, parentItem)
if "@@Import@@" in keys:
for importedModule in \
- dict["@@Import@@"].getImports().values():
+ dictionary["@@Import@@"].getImports().values():
m_node = BrowserImportItem(
node,
importedModule.importedModuleName,
