diff -r 0665c4d509c9 -r d001bc703c29 eric6/Project/ProjectSourcesBrowser.py
--- a/eric6/Project/ProjectSourcesBrowser.py Tue Sep 24 19:44:17 2019 +0200
+++ b/eric6/Project/ProjectSourcesBrowser.py Wed Sep 25 18:25:43 2019 +0200
@@ -15,12 +15,15 @@
from E5Gui import E5MessageBox
-from UI.BrowserModel import BrowserFileItem, BrowserClassItem, \
- BrowserMethodItem, BrowserClassAttributeItem, BrowserImportItem
+from UI.BrowserModel import (
+ BrowserFileItem, BrowserClassItem, BrowserMethodItem,
+ BrowserClassAttributeItem, BrowserImportItem
+)
-from .ProjectBrowserModel import ProjectBrowserFileItem, \
- ProjectBrowserSimpleDirectoryItem, ProjectBrowserDirectoryItem, \
- ProjectBrowserSourceType
+from .ProjectBrowserModel import (
+ ProjectBrowserFileItem, ProjectBrowserSimpleDirectoryItem,
+ ProjectBrowserDirectoryItem, ProjectBrowserSourceType
+)
from .ProjectBaseBrowser import ProjectBaseBrowser
import Utilities
@@ -46,8 +49,8 @@
ProjectBaseBrowser.__init__(self, project, ProjectBrowserSourceType,
parent)
- self.selectedItemsFilter = \
- [ProjectBrowserFileItem, ProjectBrowserSimpleDirectoryItem]
+ self.selectedItemsFilter = [ProjectBrowserFileItem,
+ ProjectBrowserSimpleDirectoryItem]
self.setWindowTitle(self.tr('Sources'))
@@ -595,10 +598,12 @@
cnt = categories["sum"]
bfcnt = categories[str(ProjectBrowserFileItem)]
- cmcnt = categories[str(BrowserClassItem)] + \
- categories[str(BrowserMethodItem)] + \
- categories[str(BrowserClassAttributeItem)] + \
+ cmcnt = (
+ categories[str(BrowserClassItem)] +
+ categories[str(BrowserMethodItem)] +
+ categories[str(BrowserClassAttributeItem)] +
categories[str(BrowserImportItem)]
+ )
sdcnt = categories[str(ProjectBrowserSimpleDirectoryItem)]
if cnt > 1 and cnt == bfcnt:
self.multiMenu.popup(self.mapToGlobal(coord))
@@ -648,9 +653,11 @@
self.checksMenu.menuAction().setEnabled(
True)
self.sourceMenu.popup(self.mapToGlobal(coord))
- elif isinstance(itm, BrowserClassItem) or \
- isinstance(itm, BrowserMethodItem) or \
- isinstance(itm, BrowserImportItem):
+ elif isinstance(
+ itm,
+ (BrowserClassItem, BrowserMethodItem,
+ BrowserImportItem)
+ ):
self.menu.popup(self.mapToGlobal(coord))
elif isinstance(itm, BrowserClassAttributeItem):
self.attributeMenu.popup(self.mapToGlobal(coord))
@@ -720,24 +727,33 @@
tfn = Utilities.getTestFileName(fn)
basename = os.path.splitext(fn)[0]
tbasename = os.path.splitext(tfn)[0]
- prEnable = prEnable or \
- os.path.isfile("{0}.profile".format(basename)) or \
+ prEnable = (
+ prEnable or
+ os.path.isfile("{0}.profile".format(basename)) or
os.path.isfile("{0}.profile".format(tbasename))
- coEnable = (coEnable or
- os.path.isfile("{0}.coverage".format(basename)) or
- os.path.isfile("{0}.coverage".format(tbasename))) and \
- (self.project.isPy3Project() or self.project.isPy2Project())
+ )
+ coEnable = (
+ (coEnable or
+ os.path.isfile("{0}.coverage".format(basename)) or
+ os.path.isfile("{0}.coverage".format(tbasename))) and
+ (self.project.isPy3Project() or
+ self.project.isPy2Project())
+ )
# now check the selected item
itm = self.model().item(self.currentIndex())
fn = itm.fileName()
if fn is not None:
basename = os.path.splitext(fn)[0]
- prEnable = prEnable or \
+ prEnable = (
+ prEnable or
os.path.isfile("{0}.profile".format(basename))
- coEnable = (coEnable or
- os.path.isfile("{0}.coverage".format(basename))) and \
+ )
+ coEnable = (
+ (coEnable or
+ os.path.isfile("{0}.coverage".format(basename))) and
(itm.isPython3File() or itm.isPython2File())
+ )
self.profileMenuAction.setEnabled(prEnable)
self.coverageMenuAction.setEnabled(coEnable)
@@ -784,12 +800,15 @@
Private method to add a new package 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 = ""
@@ -843,12 +862,15 @@
Private method to add a source file 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
@@ -859,12 +881,15 @@
Private method to add source 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
@@ -884,8 +909,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 files"),
