Mercurial Repositories > eric / file diff

--- a/eric6/Project/ProjectBaseBrowser.py	Tue Sep 24 19:44:17 2019 +0200
+++ b/eric6/Project/ProjectBaseBrowser.py	Wed Sep 25 18:25:43 2019 +0200
@@ -10,11 +10,14 @@
 
 import os
 
-from PyQt5.QtCore import QModelIndex, pyqtSignal, Qt, QCoreApplication, \
-    QItemSelectionModel, QItemSelection, QElapsedTimer
+from PyQt5.QtCore import (
+    QModelIndex, pyqtSignal, Qt, QCoreApplication, QItemSelectionModel,
+    QItemSelection, QElapsedTimer
+)
 from PyQt5.QtGui import QCursor
-from PyQt5.QtWidgets import QTreeView, QApplication, QMenu, QDialog, \
-    QAbstractItemView
+from PyQt5.QtWidgets import (
+    QTreeView, QApplication, QMenu, QDialog, QAbstractItemView
+)
 
 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
@@ -22,10 +25,13 @@
 from UI.Browser import Browser
 from UI.BrowserModel import BrowserDirectoryItem, BrowserFileItem
 
-from .ProjectBrowserModel import ProjectBrowserSimpleDirectoryItem, \
-    ProjectBrowserDirectoryItem, ProjectBrowserFileItem
-from .ProjectBrowserSortFilterProxyModel import \
+from .ProjectBrowserModel import (
+    ProjectBrowserSimpleDirectoryItem, ProjectBrowserDirectoryItem,
+    ProjectBrowserFileItem
+)
+from .ProjectBrowserSortFilterProxyModel import (
     ProjectBrowserSortFilterProxyModel
+)
 
 
 class ProjectBaseBrowser(Browser):
@@ -283,8 +289,9 @@
             dn = self.project.getRelativePath(dn)
             dirs.append(dn)
         
-        from UI.DeleteFilesConfirmationDialog import \
+        from UI.DeleteFilesConfirmationDialog import (
             DeleteFilesConfirmationDialog
+        )
         dlg = DeleteFilesConfirmationDialog(
             self.parent(),
             QCoreApplication.translate(
@@ -364,9 +371,13 @@
         index = self.model().index(0, 0)
         while index.isValid():
             itm = self.model().item(index)
-            if (isinstance(itm, ProjectBrowserSimpleDirectoryItem) or
-                isinstance(itm, ProjectBrowserDirectoryItem)) and \
-               not self.isExpanded(index):
+            if (
+                isinstance(
+                    itm,
+                    (ProjectBrowserSimpleDirectoryItem,
+                     ProjectBrowserDirectoryItem)) and
+                not self.isExpanded(index)
+            ):
                 self.expand(index)
             index = self.indexBelow(index)
         self.layoutDisplay()
@@ -391,9 +402,13 @@
         index = vindex
         while index.isValid():
             itm = self.model().item(index)
-            if (isinstance(itm, ProjectBrowserSimpleDirectoryItem) or
-                isinstance(itm, ProjectBrowserDirectoryItem)) and \
-               self.isExpanded(index):
+            if (
+                isinstance(
+                    itm,
+                    (ProjectBrowserSimpleDirectoryItem,
+                     ProjectBrowserDirectoryItem)) and
+                self.isExpanded(index)
+            ):
                 self.collapse(index)
             index = self.indexAbove(index)
         self.layoutDisplay()
@@ -483,8 +498,8 @@
             return
         
         if local:
-            compareString = \
-                QCoreApplication.translate('ProjectBaseBrowser', "local")
+            compareString = QCoreApplication.translate(
+                'ProjectBaseBrowser', "local")
         else:
             compareString = self.project.vcs.vcsName()
         
@@ -503,10 +518,14 @@
         index = self.model().index(0, 0)
         while index.isValid():
             itm = self.model().item(index)
-            if self.wantedItem(itm, filterList) and \
-               compareString == itm.data(1):
-                if startIndex is not None and \
-                   startIndex.parent() != index.parent():
+            if (
+                self.wantedItem(itm, filterList) and
+                compareString == itm.data(1)
+            ):
+                if (
+                    startIndex is not None and
+                    startIndex.parent() != index.parent()
+                ):
                     self._setItemRangeSelected(startIndex, endIndex, True)
                     startIndex = None
                 selectedEntries += 1
@@ -645,14 +664,18 @@
                 if self.isExpanded(index):
                     childIndex = self.indexBelow(index)
                     while childIndex.isValid():
-                        if not childIndex.isValid() or \
-                                childIndex.parent() == index.parent():
+                        if (
+                            not childIndex.isValid() or
+                            childIndex.parent() == index.parent()
+                        ):
                             break
                         itm = self.model().item(childIndex)
                         if itm is not None:
                             itemData = itm.data(0)
-                            if self.currentItemName and \
-                                    self.currentItemName == itemData:
+                            if (
+                                self.currentItemName and
+                                self.currentItemName == itemData
+                            ):
                                 self._selectSingleItem(childIndex)
                             if itemData in self.expandedNames:
                                 self.setExpanded(childIndex, True)