Mercurial Repositories > eric / file diff

--- a/eric6/Project/ProjectProtocolsBrowser.py	Tue Sep 24 19:44:17 2019 +0200
+++ b/eric6/Project/ProjectProtocolsBrowser.py	Wed Sep 25 18:25:43 2019 +0200
@@ -20,13 +20,16 @@
 from E5Gui import E5MessageBox
 from E5Gui.E5ProgressDialog import E5ProgressDialog
 
-from .ProjectBrowserModel import ProjectBrowserFileItem, \
-    ProjectBrowserSimpleDirectoryItem, ProjectBrowserDirectoryItem, \
-    ProjectBrowserProtocolsType
+from .ProjectBrowserModel import (
+    ProjectBrowserFileItem, ProjectBrowserSimpleDirectoryItem,
+    ProjectBrowserDirectoryItem, ProjectBrowserProtocolsType
+)
 from .ProjectBaseBrowser import ProjectBaseBrowser
 
-from UI.BrowserModel import BrowserFileItem, BrowserClassItem, \
-    BrowserMethodItem, BrowserClassAttributeItem
+from UI.BrowserModel import (
+    BrowserFileItem, BrowserClassItem, BrowserMethodItem,
+    BrowserClassAttributeItem
+)
 import UI.PixmapCache
 
 import Preferences
@@ -60,8 +63,8 @@
         ProjectBaseBrowser.__init__(self, project,
                                     ProjectBrowserProtocolsType, parent)
         
-        self.selectedItemsFilter = \
-            [ProjectBrowserFileItem, ProjectBrowserSimpleDirectoryItem]
+        self.selectedItemsFilter = [ProjectBrowserFileItem,
+                                    ProjectBrowserSimpleDirectoryItem]
         
         self.setWindowTitle(self.tr('Protocols (protobuf)'))
         
@@ -298,8 +301,10 @@
                     cnt = categories["sum"]
             
             bfcnt = categories[str(ProjectBrowserFileItem)]
-            cmcnt = categories[str(BrowserClassItem)] + \
+            cmcnt = (
+                categories[str(BrowserClassItem)] +
                 categories[str(BrowserMethodItem)]
+            )
             sdcnt = categories[str(ProjectBrowserSimpleDirectoryItem)]
             if cnt > 1 and cnt == bfcnt:
                 self.multiMenu.popup(self.mapToGlobal(coord))
@@ -312,8 +317,10 @@
                         itm = self.model().item(index)
                         if isinstance(itm, ProjectBrowserFileItem):
                             self.sourceMenu.popup(self.mapToGlobal(coord))
-                        elif isinstance(itm, BrowserClassItem) or \
-                                isinstance(itm, BrowserMethodItem):
+                        elif isinstance(
+                            itm,
+                            (BrowserClassItem, BrowserMethodItem)
+                        ):
                             self.menu.popup(self.mapToGlobal(coord))
                         else:
                             self.backMenu.popup(self.mapToGlobal(coord))
@@ -392,12 +399,15 @@
         Private method to add protocol files to the project.
         """
         itm = self.model().item(self.currentIndex())
-        if isinstance(itm, ProjectBrowserFileItem) or \
-           isinstance(itm, BrowserClassItem) or \
-           isinstance(itm, BrowserMethodItem):
+        if isinstance(
+            itm,
+            (ProjectBrowserFileItem, BrowserClassItem, BrowserMethodItem)
+        ):
             dn = os.path.dirname(itm.fileName())
-        elif isinstance(itm, ProjectBrowserSimpleDirectoryItem) or \
-                isinstance(itm, ProjectBrowserDirectoryItem):
+        elif isinstance(
+            itm,
+            (ProjectBrowserSimpleDirectoryItem, ProjectBrowserDirectoryItem)
+        ):
             dn = itm.dirName()
         else:
             dn = None
@@ -408,12 +418,15 @@
         Private method to add protocol files of a directory to the project.
         """
         itm = self.model().item(self.currentIndex())
-        if isinstance(itm, ProjectBrowserFileItem) or \
-           isinstance(itm, BrowserClassItem) or \
-           isinstance(itm, BrowserMethodItem):
+        if isinstance(
+            itm,
+            (ProjectBrowserFileItem, BrowserClassItem, BrowserMethodItem)
+        ):
             dn = os.path.dirname(itm.fileName())
-        elif isinstance(itm, ProjectBrowserSimpleDirectoryItem) or \
-                isinstance(itm, ProjectBrowserDirectoryItem):
+        elif isinstance(
+            itm,
+            (ProjectBrowserSimpleDirectoryItem, ProjectBrowserDirectoryItem)
+        ):
             dn = itm.dirName()
         else:
             dn = None
@@ -433,8 +446,9 @@
             fn = self.project.getRelativePath(fn2)
             files.append(fn)
         
-        from UI.DeleteFilesConfirmationDialog import \
+        from UI.DeleteFilesConfirmationDialog import (
             DeleteFilesConfirmationDialog
+        )
         dlg = DeleteFilesConfirmationDialog(
             self.parent(),
             self.tr("Delete Protocols"),
@@ -471,8 +485,10 @@
         else:
             exe = Preferences.getProtobuf("protoc")
             if exe == "":
-                exe = Utilities.isWindowsPlatform() and \
+                exe = (
+                    Utilities.isWindowsPlatform() and
                     "protoc.exe" or "protoc"
+                )
             if not Utilities.isinpath(exe):
                 exe = None