Mercurial Repositories > eric / changeset
changeset
Continued to resolve code style issue M841.
Wed, 25 Sep 2019 18:25:43 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Wed, 25 Sep 2019 18:25:43 +0200
- changeset 7266
- d001bc703c29
- parent 7265
- 0665c4d509c9
- child 7267
- aedc309827c7
Continued to resolve code style issue M841.
--- 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)
--- a/eric6/Project/ProjectBrowserFlags.py Tue Sep 24 19:44:17 2019 +0200 +++ b/eric6/Project/ProjectBrowserFlags.py Wed Sep 25 18:25:43 2019 +0200 @@ -15,13 +15,15 @@ OthersBrowserFlag = 32 ProtocolsBrowserFlag = 64 -AllBrowsersFlag = SourcesBrowserFlag | \ - FormsBrowserFlag | \ - ResourcesBrowserFlag | \ - TranslationsBrowserFlag | \ - InterfacesBrowserFlag | \ - OthersBrowserFlag | \ +AllBrowsersFlag = ( + SourcesBrowserFlag | + FormsBrowserFlag | + ResourcesBrowserFlag | + TranslationsBrowserFlag | + InterfacesBrowserFlag | + OthersBrowserFlag | ProtocolsBrowserFlag +) # # eflag: noqa = M702
--- a/eric6/Project/ProjectBrowserModel.py Tue Sep 24 19:44:17 2019 +0200 +++ b/eric6/Project/ProjectBrowserModel.py Wed Sep 25 18:25:43 2019 +0200 @@ -14,8 +14,9 @@ from PyQt5.QtCore import QDir, QModelIndex, pyqtSignal, QFileSystemWatcher, Qt from PyQt5.QtGui import QColor -from UI.BrowserModel import BrowserModel, BrowserItem, BrowserDirectoryItem, \ - BrowserFileItem +from UI.BrowserModel import ( + BrowserModel, BrowserItem, BrowserDirectoryItem, BrowserFileItem +) import UI.PixmapCache import Preferences @@ -276,8 +277,8 @@ "Z": Preferences.getProjectBrowserColour(self.colorNames["Z"]), } - self.highLightColor = \ - Preferences.getProjectBrowserColour("Highlighted") + self.highLightColor = Preferences.getProjectBrowserColour( + "Highlighted") # needed by preferencesChanged() self.vcsStatusReport = {} @@ -376,8 +377,10 @@ parentItem.getProjectTypes()[0]) if self.project.vcs is not None: fname = f.absoluteFilePath() - if states[os.path.normcase(fname)] == \ - self.project.vcs.canBeCommitted: + if ( + states[os.path.normcase(fname)] == + self.project.vcs.canBeCommitted + ): node.addVcsStatus(self.project.vcs.vcsName()) self.project.clearStatusMonitorCachedState( f.absoluteFilePath()) @@ -454,8 +457,10 @@ False, bold, sourceLanguage=sourceLanguage) self._addItem(itm, parentItem) if self.project.vcs is not None: - if states[os.path.normcase(fname)] == \ - self.project.vcs.canBeCommitted: + if ( + states[os.path.normcase(fname)] == + self.project.vcs.canBeCommitted + ): itm.addVcsStatus(self.project.vcs.vcsName()) else: itm.addVcsStatus(self.tr("local")) @@ -633,8 +638,10 @@ """ index = QModelIndex() itm = self.findItem(name) - if itm is not None and \ - isinstance(itm, ProjectBrowserFileItem): + if ( + itm is not None and + isinstance(itm, ProjectBrowserFileItem) + ): olditem = itm autoPopulate = Preferences.getProject("AutoPopulateItems") while itm is not None:
--- a/eric6/Project/ProjectFormsBrowser.py Tue Sep 24 19:44:17 2019 +0200 +++ b/eric6/Project/ProjectFormsBrowser.py Wed Sep 25 18:25:43 2019 +0200 @@ -19,9 +19,10 @@ from E5Gui import E5MessageBox, E5FileDialog from E5Gui.E5ProgressDialog import E5ProgressDialog -from .ProjectBrowserModel import ProjectBrowserFileItem, \ - ProjectBrowserSimpleDirectoryItem, ProjectBrowserDirectoryItem, \ - ProjectBrowserFormType +from .ProjectBrowserModel import ( + ProjectBrowserFileItem, ProjectBrowserSimpleDirectoryItem, + ProjectBrowserDirectoryItem, ProjectBrowserFormType +) from .ProjectBaseBrowser import ProjectBaseBrowser import UI.PixmapCache @@ -61,8 +62,8 @@ ProjectBaseBrowser.__init__(self, project, ProjectBrowserFormType, parent) - self.selectedItemsFilter = \ - [ProjectBrowserFileItem, ProjectBrowserSimpleDirectoryItem] + self.selectedItemsFilter = [ProjectBrowserFileItem, + ProjectBrowserSimpleDirectoryItem] self.setWindowTitle(self.tr('Forms')) @@ -124,8 +125,9 @@ self.menusAboutToBeCreated.emit() self.menu = QMenu(self) - if self.project.getProjectType() in \ - ["Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2"]: + if self.project.getProjectType() in [ + "Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2" + ]: self.menu.addAction( self.tr('Compile form'), self.__compileForm) self.menu.addAction( @@ -165,9 +167,11 @@ "generateDialogCode", self.tr('Generate Dialog Code...')), self.__generateDialogCode) - if self.hooks["compileForm"] is not None or \ - self.hooks["compileAllForms"] is not None or \ - self.hooks["generateDialogCode"] is not None: + if ( + self.hooks["compileForm"] is not None or + self.hooks["compileAllForms"] is not None or + self.hooks["generateDialogCode"] is not None + ): self.menu.addSeparator() if self.hooks["open"] is not None: self.menu.addAction( @@ -183,8 +187,9 @@ act = self.menu.addAction(self.tr('Delete'), self.__deleteFile) self.menuActions.append(act) self.menu.addSeparator() - if self.project.getProjectType() in \ - ["Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2"]: + if self.project.getProjectType() in [ + "Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2" + ]: self.menu.addAction(self.tr('New form...'), self.__newForm) else: if self.hooks["newForm"] is not None: @@ -206,9 +211,12 @@ self.menu.addAction(self.tr('Configure...'), self._configure) self.backMenu = QMenu(self) - if self.project.getProjectType() in \ - ["Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2"] or \ - self.hooks["compileAllForms"] is not None: + if ( + self.project.getProjectType() in [ + "Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2" + ] or + self.hooks["compileAllForms"] is not None + ): self.backMenu.addAction( self.tr('Compile all forms'), self.__compileAllForms) self.backMenu.addSeparator() @@ -237,8 +245,9 @@ # create the menu for multiple selected files self.multiMenu = QMenu(self) - if self.project.getProjectType() in \ - ["Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2"]: + if self.project.getProjectType() in [ + "Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2" + ]: self.multiMenu.addAction( self.tr('Compile forms'), self.__compileSelectedForms) self.multiMenu.addSeparator() @@ -283,8 +292,9 @@ self.multiMenu.addAction(self.tr('Configure...'), self._configure) self.dirMenu = QMenu(self) - if self.project.getProjectType() in \ - ["Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2"]: + if self.project.getProjectType() in [ + "Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2" + ]: self.dirMenu.addAction( self.tr('Compile all forms'), self.__compileAllForms) self.dirMenu.addSeparator() @@ -307,8 +317,9 @@ self.tr('Delete'), self._deleteDirectory) self.dirMenuActions.append(act) self.dirMenu.addSeparator() - if self.project.getProjectType() in \ - ["Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2"]: + if self.project.getProjectType() in [ + "Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2" + ]: self.dirMenu.addAction(self.tr('New form...'), self.__newForm) else: if self.hooks["newForm"] is not None: @@ -332,8 +343,9 @@ self.dirMenu.addAction(self.tr('Configure...'), self._configure) self.dirMultiMenu = QMenu(self) - if self.project.getProjectType() in \ - ["Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2"]: + if self.project.getProjectType() in [ + "Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2" + ]: self.dirMultiMenu.addAction( self.tr('Compile all forms'), self.__compileAllForms) self.dirMultiMenu.addSeparator() @@ -458,8 +470,10 @@ itm = self.model().item(self.currentIndex()) if isinstance(itm, ProjectBrowserFileItem): 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 @@ -472,8 +486,10 @@ itm = self.model().item(self.currentIndex()) if isinstance(itm, ProjectBrowserFileItem): 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 @@ -554,8 +570,9 @@ if self.hooks["newForm"] is not None: self.hooks["newForm"](path) else: - if self.project.getProjectType() in \ - ["Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2"]: + if self.project.getProjectType() in [ + "Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2" + ]: self.__newUiForm(path) def __newUiForm(self, path): @@ -635,8 +652,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 forms"), @@ -665,8 +683,9 @@ """ self.__resetUiCompiler() - if self.project.getProjectLanguage() in \ - ["Python", "Python2", "Python3"]: + if self.project.getProjectLanguage() in [ + "Python", "Python2", "Python3" + ]: if self.project.getProjectType() in ["Qt4", ]: self.__uicompiler = Utilities.generatePyQtToolPath( 'pyuic4', ["py3uic4"]) @@ -677,17 +696,17 @@ self.__uicompiler = Utilities.generatePyQtToolPath( 'pyuic5', ["py3uic5"]) elif self.project.getProjectType() == "PySide": - self.__uicompiler = \ - Utilities.generatePySideToolPath('pyside-uic', "1") + self.__uicompiler = Utilities.generatePySideToolPath( + 'pyside-uic', "1") elif self.project.getProjectType() == "PySide2": - self.__uicompiler = \ - Utilities.generatePySideToolPath('pyside2-uic', "2") + self.__uicompiler = Utilities.generatePySideToolPath( + 'pyside2-uic', "2") elif self.project.getProjectLanguage() == "Ruby": if self.project.getProjectType() == "Qt4": self.__uicompiler = 'rbuic4' if Utilities.isWindowsPlatform(): - self.__uicompiler = \ - Utilities.getWindowsExecutablePath(self.__uicompiler) + self.__uicompiler = Utilities.getWindowsExecutablePath( + self.__uicompiler) def getUiCompiler(self): """ @@ -816,8 +835,9 @@ ofn, ext = os.path.splitext(fn) fn = os.path.join(self.project.ppath, fn) - if self.project.getProjectLanguage() in \ - ["Python", "Python2", "Python3"]: + if self.project.getProjectLanguage() in [ + "Python", "Python2", "Python3" + ]: dirname, filename = os.path.split(ofn) self.compiledFile = os.path.join(dirname, "Ui_" + filename + ".py") args.append("-x") @@ -831,8 +851,10 @@ args.append("--from-imports") else: # PyQt4 and PyQt5 - if 'uic5' in uicompiler and \ - self.project.pdata["UICPARAMS"]["Package"]: + if ( + 'uic5' in uicompiler and + self.project.pdata["UICPARAMS"]["Package"] + ): args.append("--import-from={0}".format( self.project.pdata["UICPARAMS"]["Package"])) elif Preferences.getQt("PyuicFromImports"): @@ -986,8 +1008,9 @@ if self.hooks["compileChangedForms"] is not None: self.hooks["compileChangedForms"](self.project.pdata["FORMS"]) else: - if self.project.getProjectType() not in \ - ["Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2"]: + if self.project.getProjectType() not in [ + "Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2" + ]: # ignore the request for non Qt GUI projects return @@ -1006,14 +1029,17 @@ QApplication.processEvents() ifn = os.path.join(self.project.ppath, fn) - if self.project.getProjectLanguage() in \ - ["Python", "Python2", "Python3"]: + if self.project.getProjectLanguage() in [ + "Python", "Python2", "Python3" + ]: dirname, filename = os.path.split(os.path.splitext(ifn)[0]) ofn = os.path.join(dirname, "Ui_" + filename + ".py") elif self.project.getProjectLanguage() == "Ruby": ofn = os.path.splitext(ifn)[0] + '.rb' - if not os.path.exists(ofn) or \ - os.stat(ifn).st_mtime > os.stat(ofn).st_mtime: + if ( + not os.path.exists(ofn) or + os.stat(ifn).st_mtime > os.stat(ofn).st_mtime + ): changedForms.append(fn) i += 1 progress.setValue(i)
--- 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"),
--- 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
--- a/eric6/Project/ProjectResourcesBrowser.py Tue Sep 24 19:44:17 2019 +0200 +++ b/eric6/Project/ProjectResourcesBrowser.py Wed Sep 25 18:25:43 2019 +0200 @@ -17,9 +17,10 @@ from E5Gui import E5MessageBox, E5FileDialog from E5Gui.E5ProgressDialog import E5ProgressDialog -from .ProjectBrowserModel import ProjectBrowserFileItem, \ - ProjectBrowserSimpleDirectoryItem, ProjectBrowserDirectoryItem, \ - ProjectBrowserResourceType +from .ProjectBrowserModel import ( + ProjectBrowserFileItem, ProjectBrowserSimpleDirectoryItem, + ProjectBrowserDirectoryItem, ProjectBrowserResourceType +) from .ProjectBaseBrowser import ProjectBaseBrowser import UI.PixmapCache @@ -53,8 +54,8 @@ ProjectBaseBrowser.__init__(self, project, ProjectBrowserResourceType, parent) - self.selectedItemsFilter = \ - [ProjectBrowserFileItem, ProjectBrowserSimpleDirectoryItem] + self.selectedItemsFilter = [ProjectBrowserFileItem, + ProjectBrowserSimpleDirectoryItem] self.setWindowTitle(self.tr('Resources')) @@ -77,9 +78,10 @@ self.dirMultiMenuActions = [] self.menu = QMenu(self) - if self.project.getProjectType() in \ - ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", - "PySide", "PySideC", "PySide2", "PySideC2"]: + if self.project.getProjectType() in [ + "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", + "PySide", "PySideC", "PySide2", "PySideC2" + ]: self.menu.addAction( self.tr('Compile resource'), self.__compileResource) @@ -104,8 +106,10 @@ "compileAllResources", self.tr('Compile all resources')), self.__compileAllResources) - if self.hooks["compileResource"] is not None or \ - self.hooks["compileAllResources"] is not None: + if ( + self.hooks["compileResource"] is not None or + self.hooks["compileAllResources"] is not None + ): self.menu.addSeparator() self.menu.addAction(self.tr('Open'), self.__openFile) self.menu.addSeparator() @@ -117,9 +121,10 @@ act = self.menu.addAction(self.tr('Delete'), self.__deleteFile) self.menuActions.append(act) self.menu.addSeparator() - if self.project.getProjectType() in \ - ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", - "PySide", "PySideC", "PySide2", "PySideC2"]: + if self.project.getProjectType() in [ + "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", + "PySide", "PySideC", "PySide2", "PySideC2" + ]: self.menu.addAction( self.tr('New resource...'), self.__newResource) else: @@ -145,9 +150,10 @@ self.menu.addAction(self.tr('Configure...'), self._configure) self.backMenu = QMenu(self) - if self.project.getProjectType() in \ - ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", - "PySide", "PySideC", "PySide2", "PySideC2"]: + if self.project.getProjectType() in [ + "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", + "PySide", "PySideC", "PySide2", "PySideC2" + ]: self.backMenu.addAction( self.tr('Compile all resources'), self.__compileAllResources) @@ -187,9 +193,10 @@ # create the menu for multiple selected files self.multiMenu = QMenu(self) - if self.project.getProjectType() in \ - ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", - "PySide", "PySideC", "PySide2", "PySideC2"]: + if self.project.getProjectType() in [ + "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", + "PySide", "PySideC", "PySide2", "PySideC2" + ]: act = self.multiMenu.addAction( self.tr('Compile resources'), self.__compileSelectedResources) @@ -223,9 +230,10 @@ self.multiMenu.addAction(self.tr('Configure...'), self._configure) self.dirMenu = QMenu(self) - if self.project.getProjectType() in \ - ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", - "PySide", "PySideC", "PySide2", "PySideC2"]: + if self.project.getProjectType() in [ + "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", + "PySide", "PySideC", "PySide2", "PySideC2" + ]: self.dirMenu.addAction( self.tr('Compile all resources'), self.__compileAllResources) @@ -268,9 +276,10 @@ self.dirMenu.addAction(self.tr('Configure...'), self._configure) self.dirMultiMenu = QMenu(self) - if self.project.getProjectType() in \ - ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", - "PySide", "PySideC", "PySide2", "PySideC2"]: + if self.project.getProjectType() in [ + "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", + "PySide", "PySideC", "PySide2", "PySideC2" + ]: self.dirMultiMenu.addAction( self.tr('Compile all resources'), self.__compileAllResources) @@ -398,8 +407,10 @@ itm = self.model().item(self.currentIndex()) if isinstance(itm, ProjectBrowserFileItem): 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 @@ -412,8 +423,10 @@ itm = self.model().item(self.currentIndex()) if isinstance(itm, ProjectBrowserFileItem): 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 @@ -520,8 +533,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 resources"), @@ -642,12 +656,14 @@ args = [] self.buf = "" - if self.project.getProjectLanguage() in \ - ["Python", "Python2", "Python3"]: + if self.project.getProjectLanguage() in [ + "Python", "Python2", "Python3" + ]: if self.project.getProjectType() in ["Qt4", "Qt4C"]: self.rccCompiler = Utilities.generatePyQtToolPath('pyrcc4') - if self.project.getProjectLanguage() in \ - ["Python", "Python2"]: + if self.project.getProjectLanguage() in [ + "Python", "Python2" + ]: args.append("-py2") else: args.append("-py3") @@ -658,16 +674,18 @@ elif self.project.getProjectType() in ["PySide", "PySideC"]: self.rccCompiler = Utilities.generatePySideToolPath( 'pyside-rcc', "1") - if self.project.getProjectLanguage() in \ - ["Python", "Python2"]: + if self.project.getProjectLanguage() in [ + "Python", "Python2" + ]: args.append("-py2") else: args.append("-py3") elif self.project.getProjectType() in ["PySide2", "PySide2C"]: self.rccCompiler = Utilities.generatePySideToolPath( 'pyside2-rcc', "2") - if self.project.getProjectLanguage() in \ - ["Python", "Python2"]: + if self.project.getProjectLanguage() in [ + "Python", "Python2" + ]: args.append("-py2") else: args.append("-py3") @@ -675,19 +693,24 @@ return None defaultParameters = self.project.getDefaultRccCompilerParameters() rccParameters = self.project.pdata["RCCPARAMS"] - if rccParameters["CompressionThreshold"] != \ - defaultParameters["CompressionThreshold"]: + if ( + rccParameters["CompressionThreshold"] != + defaultParameters["CompressionThreshold"] + ): args.append("-threshold") args.append(str(rccParameters["CompressionThreshold"])) - if rccParameters["CompressLevel"] != \ - defaultParameters["CompressLevel"]: + if ( + rccParameters["CompressLevel"] != + defaultParameters["CompressLevel"] + ): args.append("-compress") args.append(str(rccParameters["CompressLevel"])) - if rccParameters["CompressionDisable"] != \ - defaultParameters["CompressionDisable"]: + if ( + rccParameters["CompressionDisable"] != + defaultParameters["CompressionDisable"] + ): args.append("-no-compress") - if rccParameters["PathPrefix"] != \ - defaultParameters["PathPrefix"]: + if rccParameters["PathPrefix"] != defaultParameters["PathPrefix"]: args.append("-root") args.append(rccParameters["PathPrefix"]) elif self.project.getProjectLanguage() == "Ruby": @@ -706,8 +729,9 @@ fn = os.path.join(self.project.ppath, fn) dirname, filename = os.path.split(ofn) - if self.project.getProjectLanguage() in \ - ["Python", "Python2", "Python3"]: + if self.project.getProjectLanguage() in [ + "Python", "Python2", "Python3" + ]: self.compiledFile = os.path.join( dirname, self.RCFilenameFormatPython.format(filename)) elif self.project.getProjectLanguage() == "Ruby": @@ -842,8 +866,10 @@ lbuf = "" for line in buf.splitlines(): line = line.strip() - if line.lower().startswith("<file>") or \ - line.lower().startswith("<file "): + if ( + line.lower().startswith("<file>") or + line.lower().startswith("<file ") + ): lbuf = line elif lbuf: lbuf = "{0}{1}".format(lbuf, line) @@ -851,8 +877,10 @@ rfile = lbuf.split(">", 1)[1].split("<", 1)[0] if not os.path.isabs(rfile): rfile = os.path.join(qrcDirName, rfile) - if os.path.exists(rfile) and \ - os.stat(rfile).st_mtime > mtime: + if ( + os.path.exists(rfile) and + os.stat(rfile).st_mtime > mtime + ): return True lbuf = "" @@ -881,8 +909,9 @@ progress.setValue(i) QApplication.processEvents() ifn = os.path.join(self.project.ppath, fn) - if self.project.getProjectLanguage() in \ - ["Python", "Python2", "Python3"]: + if self.project.getProjectLanguage() in [ + "Python", "Python2", "Python3" + ]: dirname, filename = os.path.split(os.path.splitext(ifn)[0]) ofn = os.path.join( dirname, self.RCFilenameFormatPython.format(filename)) @@ -892,8 +921,10 @@ dirname, self.RCFilenameFormatRuby.format(filename)) else: return - if not os.path.exists(ofn) or \ - os.stat(ifn).st_mtime > os.stat(ofn).st_mtime: + if ( + not os.path.exists(ofn) or + os.stat(ifn).st_mtime > os.stat(ofn).st_mtime + ): changedResources.append(fn) elif self.__checkResourcesNewer(ifn, os.stat(ofn).st_mtime): changedResources.append(fn)
--- 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"),
--- a/eric6/Project/ProjectTranslationsBrowser.py Tue Sep 24 19:44:17 2019 +0200 +++ b/eric6/Project/ProjectTranslationsBrowser.py Wed Sep 25 18:25:43 2019 +0200 @@ -19,9 +19,10 @@ from E5Gui import E5MessageBox from E5Gui.E5Application import e5App -from .ProjectBrowserModel import ProjectBrowserFileItem, \ - ProjectBrowserSimpleDirectoryItem, ProjectBrowserDirectoryItem, \ - ProjectBrowserTranslationType +from .ProjectBrowserModel import ( + ProjectBrowserFileItem, ProjectBrowserSimpleDirectoryItem, + ProjectBrowserDirectoryItem, ProjectBrowserTranslationType +) from .ProjectBaseBrowser import ProjectBaseBrowser import UI.PixmapCache @@ -56,8 +57,8 @@ ProjectBrowserTranslationType, parent) self.isTranslationsBrowser = True - self.selectedItemsFilter = \ - [ProjectBrowserFileItem, ProjectBrowserSimpleDirectoryItem] + self.selectedItemsFilter = [ProjectBrowserFileItem, + ProjectBrowserSimpleDirectoryItem] self.setWindowTitle(self.tr('Translations')) @@ -100,9 +101,10 @@ self.qmprocBackMenuActions = [] self.menu = QMenu(self) - if self.project.getProjectType() in \ - ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", - "PySide", "PySideC", "PySide2", "PySideC2"]: + if self.project.getProjectType() in [ + "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", + "PySide", "PySideC", "PySide2", "PySideC2" + ]: act = self.menu.addAction( self.tr('Generate translation'), self.__generateSelected) self.tsMenuActions.append(act) @@ -227,9 +229,10 @@ self.menu.addAction(self.tr('Configure...'), self._configure) self.backMenu = QMenu(self) - if self.project.getProjectType() in \ - ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", - "PySide", "PySideC", "PySide2", "PySideC2"]: + if self.project.getProjectType() in [ + "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", + "PySide", "PySideC", "PySide2", "PySideC2" + ]: act = self.backMenu.addAction( self.tr('Generate all translations'), self.__generateAll) @@ -288,9 +291,10 @@ # create the menu for multiple selected files self.multiMenu = QMenu(self) - if self.project.getProjectType() in \ - ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", - "PySide", "PySideC", "PySide2", "PySideC2"]: + if self.project.getProjectType() in [ + "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", + "PySide", "PySideC", "PySide2", "PySideC2" + ]: act = self.multiMenu.addAction( self.tr('Generate translations'), self.__generateSelected) @@ -372,9 +376,10 @@ self.multiMenu.addAction(self.tr('Configure...'), self._configure) self.dirMenu = QMenu(self) - if self.project.getProjectType() in \ - ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", - "PySide", "PySideC", "PySide2", "PySideC2"]: + if self.project.getProjectType() in [ + "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", + "PySide", "PySideC", "PySide2", "PySideC2" + ]: act = self.dirMenu.addAction( self.tr('Generate all translations'), self.__generateAll) @@ -490,9 +495,10 @@ """ Private slot called by the menu aboutToShow signal. """ - if self.project.getProjectType() in \ - ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", - "PySide", "PySideC", "PySide2", "PySideC2"]: + if self.project.getProjectType() in [ + "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", + "PySide", "PySideC", "PySide2", "PySideC2" + ]: tsFiles = 0 qmFiles = 0 itmList = self.getSelectedItems() @@ -501,8 +507,10 @@ tsFiles += 1 elif itm.fileName().endswith('.qm'): qmFiles += 1 - if (tsFiles > 0 and qmFiles > 0) or \ - (tsFiles == 0 and qmFiles == 0): + if ( + (tsFiles > 0 and qmFiles > 0) or + (tsFiles == 0 and qmFiles == 0) + ): for act in self.tsMenuActions + self.qmMenuActions: act.setEnabled(False) elif tsFiles > 0: @@ -532,9 +540,10 @@ """ Private slot called by the multiMenu aboutToShow signal. """ - if self.project.getProjectType() in \ - ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", - "PySide", "PySideC", "PySide2", "PySideC2"]: + if self.project.getProjectType() in [ + "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", + "PySide", "PySideC", "PySide2", "PySideC2" + ]: tsFiles = 0 qmFiles = 0 itmList = self.getSelectedItems() @@ -543,8 +552,10 @@ tsFiles += 1 elif itm.fileName().endswith('.qm'): qmFiles += 1 - if (tsFiles > 0 and qmFiles > 0) or \ - (tsFiles == 0 and qmFiles == 0): + if ( + (tsFiles > 0 and qmFiles > 0) or + (tsFiles == 0 and qmFiles == 0) + ): for act in self.tsMultiMenuActions + self.qmMultiMenuActions: act.setEnabled(False) elif tsFiles > 0: @@ -572,9 +583,10 @@ """ Private slot called by the dirMenu aboutToShow signal. """ - if self.project.getProjectType() in \ - ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", - "PySide", "PySideC", "PySide2", "PySideC2"]: + if self.project.getProjectType() in [ + "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", + "PySide", "PySideC", "PySide2", "PySideC2" + ]: if self.pylupdateProcRunning: for act in self.tsprocDirMenuActions: act.setEnabled(False) @@ -592,9 +604,10 @@ """ Private slot called by the backMenu aboutToShow signal. """ - if self.project.getProjectType() in \ - ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", - "PySide", "PySideC", "PySide2", "PySideC2"]: + if self.project.getProjectType() in [ + "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", + "PySide", "PySideC", "PySide2", "PySideC2" + ]: if self.pylupdateProcRunning: for act in self.tsprocBackMenuActions: act.setEnabled(False) @@ -613,8 +626,10 @@ itm = self.model().item(self.currentIndex()) if isinstance(itm, ProjectBrowserFileItem): 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 @@ -665,8 +680,9 @@ translationFiles = [itm.fileName() for itm in itmList] - from UI.DeleteFilesConfirmationDialog import \ + from UI.DeleteFilesConfirmationDialog import ( DeleteFilesConfirmationDialog + ) dlg = DeleteFilesConfirmationDialog( self.parent(), self.tr("Delete translation files"), @@ -763,8 +779,8 @@ for lang in langs if lang.fileName().endswith('.ts')] else: try: - pattern = self.project.pdata["TRANSLATIONPATTERN"]\ - .replace("%language%", "*") + pattern = self.project.pdata["TRANSLATIONPATTERN"].replace( + "%language%", "*") langs = [lang for lang in self.project.pdata["TRANSLATIONS"] if fnmatch.fnmatch(lang, pattern)] except IndexError: @@ -1004,8 +1020,9 @@ # generate a minimal temporary projectfile suitable for pylupdate self.__tmpProjects = [] - if self.project.getProjectLanguage() in \ - ["Python", "Python2", "Python3"]: + if self.project.getProjectLanguage() in [ + "Python", "Python2", "Python3" + ]: ok = self.__writeTempProjectFile(langs, [".py"]) else: ok = False @@ -1179,9 +1196,10 @@ self.hooks["releaseSelected"](li) return - if self.project.getProjectType() in \ - ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", - "PySide", "PySideC", "PySide2", "PySideC2"]: + if self.project.getProjectType() in [ + "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin", + "PySide", "PySideC", "PySide2", "PySideC2" + ]: lrelease = os.path.join( Utilities.getQtBinariesPath(), Utilities.generateQtToolName("lrelease")) @@ -1195,8 +1213,8 @@ for lang in langs if lang.fileName().endswith('.ts')] else: try: - pattern = self.project.pdata["TRANSLATIONPATTERN"]\ - .replace("%language%", "*") + pattern = self.project.pdata["TRANSLATIONPATTERN"].replace( + "%language%", "*") langs = [lang for lang in self.project.pdata["TRANSLATIONS"] if fnmatch.fnmatch(lang, pattern)] except IndexError:
--- a/eric6/Project/PropertiesDialog.py Tue Sep 24 19:44:17 2019 +0200 +++ b/eric6/Project/PropertiesDialog.py Wed Sep 25 18:25:43 2019 +0200 @@ -56,8 +56,8 @@ for pattern, filetype in self.project.pdata["FILETYPES"].items(): if filetype == "SOURCES": patterns.append(pattern) - filters = self.tr("Source Files ({0});;All Files (*)")\ - .format(" ".join(sorted(patterns))) + filters = self.tr("Source Files ({0});;All Files (*)" + ).format(" ".join(sorted(patterns))) self.mainscriptPicker.setFilters(filters) self.languageComboBox.addItems(project.getProgrammingLanguages()) @@ -70,8 +70,10 @@ self.projectTypeComboBox.addItem( projectType[0], projectType[1]) - ipath = Preferences.getMultiProject("Workspace") or \ + ipath = ( + Preferences.getMultiProject("Workspace") or Utilities.getHomeDir() + ) self.__initPaths = [ Utilities.fromNativeSeparators(ipath), Utilities.fromNativeSeparators(ipath) + "/", @@ -100,11 +102,13 @@ self.eolComboBox.setCurrentIndex(self.project.pdata["EOL"]) self.vcsLabel.show() if self.project.vcs is not None: - vcsSystemsDict = e5App().getObject("PluginManager")\ + vcsSystemsDict = ( + e5App().getObject("PluginManager") .getPluginDisplayStrings("version_control") + ) try: - vcsSystemDisplay = \ - vcsSystemsDict[self.project.pdata["VCS"]] + vcsSystemDisplay = vcsSystemsDict[ + self.project.pdata["VCS"]] except KeyError: vcsSystemDisplay = "None" self.vcsLabel.setText( @@ -175,8 +179,8 @@ """ if self.spellPropertiesDlg is None: from .SpellingPropertiesDialog import SpellingPropertiesDialog - self.spellPropertiesDlg = \ - SpellingPropertiesDialog(self.project, self.newProject, self) + self.spellPropertiesDlg = SpellingPropertiesDialog( + self.project, self.newProject, self) res = self.spellPropertiesDlg.exec_() if res == QDialog.Rejected: self.spellPropertiesDlg.initDialog() # reset the dialogs contents @@ -187,11 +191,11 @@ Private slot to display the translations properties dialog. """ if self.transPropertiesDlg is None: - from .TranslationPropertiesDialog import \ + from .TranslationPropertiesDialog import ( TranslationPropertiesDialog - self.transPropertiesDlg = \ - TranslationPropertiesDialog(self.project, self.newProject, - self) + ) + self.transPropertiesDlg = TranslationPropertiesDialog( + self.project, self.newProject, self) else: self.transPropertiesDlg.initFilters() res = self.transPropertiesDlg.exec_() @@ -205,8 +209,8 @@ """ if self.makePropertiesDlg is None: from .MakePropertiesDialog import MakePropertiesDialog - self.makePropertiesDlg = \ - MakePropertiesDialog(self.project, self.newProject, self) + self.makePropertiesDlg = MakePropertiesDialog( + self.project, self.newProject, self) res = self.makePropertiesDlg.exec_() if res == QDialog.Rejected: self.makePropertiesDlg.initDialog() @@ -291,10 +295,12 @@ self.project.pdata["AUTHOR"] = self.authorEdit.text() self.project.pdata["EMAIL"] = self.emailEdit.text() self.project.pdata["DESCRIPTION"] = self.descriptionEdit.toPlainText() - self.project.pdata["PROGLANGUAGE"] = \ + self.project.pdata["PROGLANGUAGE"] = ( self.languageComboBox.currentText() - self.project.pdata["MIXEDLANGUAGE"] = \ + ) + self.project.pdata["MIXEDLANGUAGE"] = ( self.mixedLanguageCheckBox.isChecked() + ) projectType = self.getProjectType() if projectType is not None: self.project.pdata["PROJECTTYPE"] = projectType @@ -308,7 +314,8 @@ if self.transPropertiesDlg is not None: self.transPropertiesDlg.storeData() - self.project.pdata["MAKEPARAMS"]["MakeEnabled"] = \ + self.project.pdata["MAKEPARAMS"]["MakeEnabled"] = ( self.makeCheckBox.isChecked() + ) if self.makePropertiesDlg is not None: self.makePropertiesDlg.storeData()
--- a/eric6/Project/UicLoadUi.py Tue Sep 24 19:44:17 2019 +0200 +++ b/eric6/Project/UicLoadUi.py Wed Sep 25 18:25:43 2019 +0200 @@ -81,7 +81,7 @@ # 2. replace QString and QStringList mapped = ( mapped - .replace("QStringList", "list")\ + .replace("QStringList", "list") .replace("QString", "str") )
--- a/eric6/Project/UserPropertiesDialog.py Tue Sep 24 19:44:17 2019 +0200 +++ b/eric6/Project/UserPropertiesDialog.py Wed Sep 25 18:25:43 2019 +0200 @@ -46,9 +46,10 @@ enableVcsGroup = False if self.project.pdata["VCS"]: found = False - for _indicator, vcsData in \ - e5App().getObject("PluginManager")\ - .getVcsSystemIndicators().items(): + for _indicator, vcsData in ( + e5App().getObject("PluginManager") + .getVcsSystemIndicators().items() + ): for vcsSystem, _vcsSystemDisplay in vcsData: if vcsSystem == self.project.pdata["VCS"]: found = True @@ -80,16 +81,19 @@ Public method to store the entered/modified data. """ vcsStatusMonitorInterval = self.vcsStatusMonitorIntervalSpinBox.value() - if vcsStatusMonitorInterval != \ - Preferences.getVCS("StatusMonitorInterval"): - self.project.pudata["VCSSTATUSMONITORINTERVAL"] = \ + if ( + vcsStatusMonitorInterval != + Preferences.getVCS("StatusMonitorInterval") + ): + self.project.pudata["VCSSTATUSMONITORINTERVAL"] = ( vcsStatusMonitorInterval + ) else: self.project.pudata["VCSSTATUSMONITORINTERVAL"] = 0 if self.vcsGroup.isEnabled(): - vcsSystem = self.vcsInterfaceCombo\ - .itemData(self.vcsInterfaceCombo.currentIndex()) + vcsSystem = self.vcsInterfaceCombo.itemData( + self.vcsInterfaceCombo.currentIndex()) if self.vcsInterfaceDefaultCheckBox.isChecked(): if vcsSystem != self.project.pdata["VCS"]: self.project.pdata["VCS"] = vcsSystem
