diff -r 0665c4d509c9 -r d001bc703c29 eric6/Project/ProjectInterfacesBrowser.py
--- a/eric6/Project/ProjectInterfacesBrowser.py Tue Sep 24 19:44:17 2019 +0200
+++ b/eric6/Project/ProjectInterfacesBrowser.py Wed Sep 25 18:25:43 2019 +0200
@@ -19,13 +19,16 @@
from E5Gui import E5MessageBox
from E5Gui.E5ProgressDialog import E5ProgressDialog
-from .ProjectBrowserModel import ProjectBrowserFileItem, \
- ProjectBrowserSimpleDirectoryItem, ProjectBrowserDirectoryItem, \
- ProjectBrowserInterfaceType
+from .ProjectBrowserModel import (
+ ProjectBrowserFileItem, ProjectBrowserSimpleDirectoryItem,
+ ProjectBrowserDirectoryItem, ProjectBrowserInterfaceType
+)
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
@@ -56,16 +59,18 @@
"""
self.omniidl = Preferences.getCorba("omniidl")
if self.omniidl == "":
- self.omniidl = Utilities.isWindowsPlatform() and \
+ self.omniidl = (
+ Utilities.isWindowsPlatform() and
"omniidl.exe" or "omniidl"
+ )
if not Utilities.isinpath(self.omniidl):
self.omniidl = None
ProjectBaseBrowser.__init__(self, project,
ProjectBrowserInterfaceType, parent)
- self.selectedItemsFilter = \
- [ProjectBrowserFileItem, ProjectBrowserSimpleDirectoryItem]
+ self.selectedItemsFilter = [ProjectBrowserFileItem,
+ ProjectBrowserSimpleDirectoryItem]
self.setWindowTitle(self.tr('Interfaces (IDL)'))
@@ -304,8 +309,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))
@@ -318,8 +325,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))
@@ -398,12 +407,15 @@
Private method to add interface 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
@@ -414,12 +426,15 @@
Private method to add interface 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
@@ -439,8 +454,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 interfaces"),
