Mercurial Repositories > eric / file diff

--- a/eric6/Project/ProjectBrowserModel.py	Wed Apr 21 17:56:12 2021 +0200
+++ b/eric6/Project/ProjectBrowserModel.py	Wed Apr 21 19:40:50 2021 +0200
@@ -345,15 +345,15 @@
         
         qdir = QDir(parentItem.dirName())
         
-        if Preferences.getProject("BrowsersListHiddenFiles"):
-            fileFilter = QDir.Filters(
+        fileFilter = (
+            QDir.Filters(
                 QDir.Filter.AllEntries |
                 QDir.Filter.Hidden |
                 QDir.Filter.NoDotAndDotDot
             )
-        else:
-            fileFilter = QDir.Filters(
-                QDir.Filter.AllEntries | QDir.Filter.NoDotAndDotDot)
+            if Preferences.getProject("BrowsersListHiddenFiles") else
+            QDir.Filters(QDir.Filter.AllEntries | QDir.Filter.NoDotAndDotDot)
+        )
         entryInfoList = qdir.entryInfoList(fileFilter)
         
         if len(entryInfoList) > 0:
@@ -371,16 +371,17 @@
                 states = self.project.vcs.vcsAllRegisteredStates(states, dname)
             
             for f in entryInfoList:
-                if f.isDir():
-                    node = ProjectBrowserDirectoryItem(
+                node = (
+                    ProjectBrowserDirectoryItem(
                         parentItem,
                         Utilities.toNativeSeparators(f.absoluteFilePath()),
                         parentItem.getProjectTypes()[0], False)
-                else:
-                    node = ProjectBrowserFileItem(
+                    if f.isDir() else
+                    ProjectBrowserFileItem(
                         parentItem,
                         Utilities.toNativeSeparators(f.absoluteFilePath()),
                         parentItem.getProjectTypes()[0])
+                )
                 if self.project.vcs is not None:
                     fname = f.absoluteFilePath()
                     if (
@@ -448,14 +449,15 @@
                 fname = os.path.join(self.project.ppath, fn)
                 parentItem, dt = self.findParentItemByName(
                     self.projectBrowserTypes[key], fn)
-                if os.path.isdir(fname):
-                    itm = ProjectBrowserDirectoryItem(
+                itm = (
+                    ProjectBrowserDirectoryItem(
                         parentItem, fname, self.projectBrowserTypes[key],
                         False, bold)
-                else:
-                    itm = ProjectBrowserFileItem(
+                    if os.path.isdir(fname) else
+                    ProjectBrowserFileItem(
                         parentItem, fname, self.projectBrowserTypes[key],
                         False, bold, sourceLanguage=sourceLanguage)
+                )
                 self._addItem(itm, parentItem)
                 if self.project.vcs is not None:
                     if (
@@ -552,10 +554,11 @@
         fname = os.path.join(self.project.ppath, name)
         parentItem, dt = self.findParentItemByName(
             self.projectBrowserTypes[typeString], name)
-        if parentItem == self.rootItem:
-            parentIndex = QModelIndex()
-        else:
-            parentIndex = self.createIndex(parentItem.row(), 0, parentItem)
+        parentIndex = (
+            QModelIndex()
+            if parentItem == self.rootItem else
+            self.createIndex(parentItem.row(), 0, parentItem)
+        )
         if os.path.isdir(fname):
             itm = ProjectBrowserDirectoryItem(
                 parentItem, fname, self.projectBrowserTypes[typeString],
@@ -686,15 +689,15 @@
             # just ignore the situation we don't have a reference to the item
             return
         
-        if Preferences.getProject("BrowsersListHiddenFiles"):
-            fileFilter = QDir.Filters(
+        fileFilter = (
+            QDir.Filters(
                 QDir.Filter.AllEntries |
                 QDir.Filter.Hidden |
                 QDir.Filter.NoDotAndDotDot
             )
-        else:
-            fileFilter = QDir.Filters(
-                QDir.Filter.AllEntries | QDir.Filter.NoDotAndDotDot)
+            if Preferences.getProject("BrowsersListHiddenFiles") else
+            QDir.Filters(QDir.Filter.AllEntries | QDir.Filter.NoDotAndDotDot)
+        )
         
         for itm in self.watchedItems[path]:
             oldCnt = itm.childCount()
@@ -719,17 +722,18 @@
                 cnt = itm.childCount()
                 self.beginInsertRows(
                     self.createIndex(itm.row(), 0, itm), cnt, cnt)
-                if f.isDir():
-                    node = ProjectBrowserDirectoryItem(
+                node = (
+                    ProjectBrowserDirectoryItem(
                         itm,
                         Utilities.toNativeSeparators(f.absoluteFilePath()),
                         itm.getProjectTypes()[0],
                         False)
-                else:
-                    node = ProjectBrowserFileItem(
+                    if f.isDir() else
+                    ProjectBrowserFileItem(
                         itm,
                         Utilities.toNativeSeparators(f.absoluteFilePath()),
                         itm.getProjectTypes()[0])
+                )
                 self._addItem(node, itm)
                 if self.project.vcs is not None:
                     self.project.vcs.clearStatusCache()
@@ -821,10 +825,11 @@
         """
         fname = os.path.basename(name)
         parentItem = self.findParentItemByName(0, name)[0]
-        if parentItem == self.rootItem:
-            parentIndex = QModelIndex()
-        else:
-            parentIndex = self.createIndex(parentItem.row(), 0, parentItem)
+        parentIndex = (
+            QModelIndex()
+            if parentItem == self.rootItem else
+            self.createIndex(parentItem.row(), 0, parentItem)
+        )
         childItem = self.findChildItem(fname, 0, parentItem)
         if childItem is not None:
             self.beginRemoveRows(parentIndex, childItem.row(), childItem.row())