Mercurial Repositories > eric / changeset
changeset
Continued to resolve code style issue M841.
Sat, 21 Sep 2019 22:03:03 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 21 Sep 2019 22:03:03 +0200
- changeset 7257
- c4d0cac9b5c9
- parent 7256
- 4ef3b78ebb4e
- child 7258
- aff39db4dacc
Continued to resolve code style issue M841.
--- a/eric6/Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.py Sat Sep 21 22:03:03 2019 +0200 @@ -14,8 +14,9 @@ from PyQt5.QtCore import pyqtSlot from PyQt5.QtWidgets import QDialog -from Preferences.ConfigurationPages.ConfigurationPageBase import \ +from Preferences.ConfigurationPages.ConfigurationPageBase import ( ConfigurationPageBase +) from .Ui_GitPage import Ui_GitPage
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -12,8 +12,10 @@ from PyQt5.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer from PyQt5.QtGui import QCursor -from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QHeaderView, \ - QTreeWidgetItem, QApplication, QLineEdit +from PyQt5.QtWidgets import ( + QWidget, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QApplication, + QLineEdit +) from E5Gui import E5MessageBox @@ -79,8 +81,10 @@ @param e close event (QCloseEvent) """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -211,8 +215,10 @@ Private slot called when the process finished or the user pressed the button. """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000)
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitBlameDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitBlameDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -12,8 +12,9 @@ import re from PyQt5.QtCore import pyqtSlot, QProcess, QTimer, Qt, QCoreApplication -from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QHeaderView, \ - QLineEdit, QTreeWidgetItem +from PyQt5.QtWidgets import ( + QDialog, QDialogButtonBox, QHeaderView, QLineEdit, QTreeWidgetItem +) from E5Gui import E5MessageBox @@ -67,8 +68,10 @@ @param e close event (QCloseEvent) """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -126,8 +129,10 @@ Private slot called when the process finished or the user pressed the button. """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000)
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitBranchDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitBranchDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -94,8 +94,10 @@ """ Private method used to enable/disable the OK-button. """ - if self.setTrackingButton.isChecked() or \ - self.unsetTrackingButton.isChecked(): + if ( + self.setTrackingButton.isChecked() or + self.unsetTrackingButton.isChecked() + ): enable = True else: enable = self.branchCombo.currentText() != ""
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitCopyDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitCopyDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -69,8 +69,10 @@ if not os.path.isabs(target): sourceDir = os.path.dirname(self.sourceEdit.text()) target = os.path.join(sourceDir, target) - return Utilities.toNativeSeparators(target), \ + return ( + Utilities.toNativeSeparators(target), self.forceCheckBox.isChecked() + ) @pyqtSlot() def on_dirButton_clicked(self):
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -11,8 +11,9 @@ import os from PyQt5.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication -from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QHeaderView, \ - QTreeWidgetItem, QLineEdit +from PyQt5.QtWidgets import ( + QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QLineEdit +) from E5Gui import E5MessageBox @@ -59,8 +60,10 @@ @param e close event (QCloseEvent) """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -124,8 +127,10 @@ Private slot called when the process finished or the user pressed the button. """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000)
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -10,8 +10,9 @@ import os -from PyQt5.QtCore import QProcess, QTimer, pyqtSlot, Qt, QCoreApplication, \ - QProcessEnvironment +from PyQt5.QtCore import ( + QProcess, QTimer, pyqtSlot, Qt, QCoreApplication, QProcessEnvironment +) from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QLineEdit from E5Gui import E5MessageBox @@ -59,8 +60,10 @@ Private slot called when the process finished or the user pressed the button. """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -79,9 +82,11 @@ if self.normal and self.errors.toPlainText(): self.errorGroup.setTitle(self.tr("Additional Output")) - if Preferences.getVCS("AutoClose") and \ - self.normal and \ - self.errors.toPlainText() == "": + if ( + Preferences.getVCS("AutoClose") and + self.normal and + self.errors.toPlainText() == "" + ): self.accept() def on_buttonBox_clicked(self, button):
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitDiffGenerator.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitDiffGenerator.py Sat Sep 21 22:03:03 2019 +0200 @@ -54,8 +54,10 @@ Public slot to stop the diff processes. """ for process in [self.process, self.process2]: - if process is not None and \ - process.state() != QProcess.NotRunning: + if ( + process is not None and + process.state() != QProcess.NotRunning + ): process.terminate() QTimer.singleShot(2000, process.kill) process.waitForFinished(3000) @@ -158,8 +160,10 @@ @param exitCode exit code of the process (integer) @param exitStatus exit status of the process (QProcess.ExitStatus) """ - if self.process.state() == QProcess.NotRunning and \ - self.process2.state() == QProcess.NotRunning: + if ( + self.process.state() == QProcess.NotRunning and + self.process2.state() == QProcess.NotRunning + ): self.finished.emit() def getResult(self):
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitDiffParser.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitDiffParser.py Sat Sep 21 22:03:03 2019 +0200 @@ -87,11 +87,11 @@ self.__hunks.append(self.__initHunk()) self.__hunks[-1]["start"] = lineIdx (self.__hunks[-1]["oldStart"], - self.__hunks[-1]["oldCount"]) = \ - self.__parseRange(m.group(1)) + self.__hunks[-1]["oldCount"]) = self.__parseRange( + m.group(1)) (self.__hunks[-1]["newStart"], - self.__hunks[-1]["newCount"]) = \ - self.__parseRange(m.group(2)) + self.__hunks[-1]["newCount"]) = self.__parseRange( + m.group(2)) self.__hunks[-1]["heading"] = m.group(3) elif not self.__hunks: raise AssertionError("Malformed hunk header: '{0}'" @@ -199,13 +199,17 @@ lineContent = line[1:] if not (startIndex <= lineIndex <= endIndex): - if (not reverse and lineType == ADDITION) or \ - (reverse and lineType == DELETION): + if ( + (not reverse and lineType == ADDITION) or + (reverse and lineType == DELETION) + ): previousLineSkipped = True continue - elif (not reverse and lineType == DELETION) or \ - (reverse and lineType == ADDITION): + elif ( + (not reverse and lineType == DELETION) or + (reverse and lineType == ADDITION) + ): lineType = CONTEXT if lineType == NONEWLINE and previousLineSkipped:
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitFetchDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitFetchDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -105,8 +105,10 @@ """ self.__updateButtonEnable() - if self.remotesComboBox.currentText() == self.__custom and \ - txt != "": + if ( + self.remotesComboBox.currentText() == self.__custom and + txt != "" + ): remoteBranches = self.__vcs.gitGetRemoteBranchesList( self.__repodir, txt) self.remoteBranchesList.clear()
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -11,12 +11,16 @@ import os import collections -from PyQt5.QtCore import pyqtSlot, Qt, QDate, QProcess, QTimer, QRegExp, \ - QSize, QPoint, QFileInfo -from PyQt5.QtGui import QCursor, QColor, QPixmap, QPainter, QPen, QIcon, \ - QTextCursor -from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QHeaderView, \ - QTreeWidgetItem, QApplication, QLineEdit, QMenu, QInputDialog +from PyQt5.QtCore import ( + pyqtSlot, Qt, QDate, QProcess, QTimer, QRegExp, QSize, QPoint, QFileInfo +) +from PyQt5.QtGui import ( + QCursor, QColor, QPixmap, QPainter, QPen, QIcon, QTextCursor +) +from PyQt5.QtWidgets import ( + QWidget, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QApplication, + QLineEdit, QMenu, QInputDialog +) from E5Gui.E5Application import e5App from E5Gui import E5MessageBox, E5FileDialog @@ -372,8 +376,10 @@ @param e close event (QCloseEvent) """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -715,10 +721,11 @@ self.__childrenInfo[parent].append(commitId) if self.logTree.topLevelItemCount() > 1: - topedges = \ + topedges = ( self.logTree.topLevelItem( - self.logTree.indexOfTopLevelItem(itm) - 1)\ + self.logTree.indexOfTopLevelItem(itm) - 1) .data(0, self.__edgesRole) + ) else: topedges = None @@ -871,8 +878,10 @@ Private slot called when the process finished or the user pressed the button. """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -906,8 +915,10 @@ ) for date in [logEntry["authordate"], logEntry["committerdate"]]: dt = QDate.fromString(date, Qt.ISODate) - if not self.__maxDate.isValid() and \ - not self.__minDate.isValid(): + if ( + not self.__maxDate.isValid() and + not self.__minDate.isValid() + ): self.__maxDate = dt self.__minDate = dt else: @@ -1217,9 +1228,11 @@ txt = topItem.data(0, self.__subjectRole) else: txt = topItem.text(fieldIndex) - if topItem.text(self.DateColumn) <= to_ and \ - topItem.text(self.DateColumn) >= from_ and \ - searchRx.indexIn(txt) > -1: + if ( + topItem.text(self.DateColumn) <= to_ and + topItem.text(self.DateColumn) >= from_ and + searchRx.indexIn(txt) > -1 + ): topItem.setHidden(False) if topItem is currentItem: self.on_logTree_currentItemChanged(topItem, None) @@ -1308,8 +1321,9 @@ index2 = self.logTree.indexOfTopLevelItem(selectedItems[1]) if index1 > index2: # Swap the entries - selectedItems[0], selectedItems[1] = \ + selectedItems[0], selectedItems[1] = ( selectedItems[1], selectedItems[0] + ) html = "{0}<hr/>{1}".format( self.__generateDetailsTableText(selectedItems[0]), self.__generateDetailsTableText(selectedItems[1]), @@ -1821,8 +1835,10 @@ res, shouldReopen = self.vcs.gitBranch( self.repodir, revision=commit, branchName=branch, branchOp=GitBranchDialog.CreateSwitchBranch) - shouldReopen = shouldReopen or \ + shouldReopen = ( + shouldReopen or QFileInfo(pfile).lastModified().toString() != lastModified + ) if res: if shouldReopen: res = E5MessageBox.yesNo(
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -53,8 +53,10 @@ self.vcsDirectoryCompleter = E5DirCompleter(self.vcsUrlCombo) self.vcsProjectDirCompleter = E5DirCompleter(self.vcsProjectDirEdit) - ipath = Preferences.getMultiProject("Workspace") or \ + ipath = ( + Preferences.getMultiProject("Workspace") or Utilities.getHomeDir() + ) self.__initPaths = [ Utilities.fromNativeSeparators(ipath), Utilities.fromNativeSeparators(ipath) + "/",
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitPullDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitPullDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -100,8 +100,10 @@ """ self.__updateButtonEnable() - if self.remotesComboBox.currentText() == self.__custom and \ - txt != "": + if ( + self.remotesComboBox.currentText() == self.__custom and + txt != "" + ): remoteBranches = self.__vcs.gitGetRemoteBranchesList( self.__repodir, txt) self.remoteBranchesList.clear()
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitPushDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitPushDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -117,11 +117,13 @@ """ if column == GitPushDialog.PushColumn: # step 1: set the item's remote branch, if it is empty - if item.checkState(GitPushDialog.PushColumn) == Qt.Checked and \ + if ( + item.checkState(GitPushDialog.PushColumn) == Qt.Checked and (self.branchesTree.itemWidget( item, - GitPushDialog.RemoteBranchColumn) - .currentText() == ""): + GitPushDialog.RemoteBranchColumn + ).currentText() == "") + ): self.branchesTree.itemWidget( item, GitPushDialog.RemoteBranchColumn).setEditText( item.text(GitPushDialog.LocalBranchColumn))
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -12,8 +12,10 @@ from PyQt5.QtCore import pyqtSlot, Qt, QProcess, QTimer, QPoint from PyQt5.QtGui import QCursor -from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QHeaderView, \ - QTreeWidgetItem, QApplication, QLineEdit +from PyQt5.QtWidgets import ( + QWidget, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QApplication, + QLineEdit +) from E5Gui import E5MessageBox @@ -92,8 +94,10 @@ @param e close event (QCloseEvent) """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -237,8 +241,10 @@ Private slot called when the process finished or the user pressed the button. """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000)
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -11,8 +11,9 @@ import os from PyQt5.QtCore import pyqtSlot, Qt, QProcess, QTimer -from PyQt5.QtWidgets import QWidget, QHeaderView, QTreeWidgetItem, \ - QDialogButtonBox, QLineEdit +from PyQt5.QtWidgets import ( + QWidget, QHeaderView, QTreeWidgetItem, QDialogButtonBox, QLineEdit +) from E5Gui import E5MessageBox @@ -94,8 +95,10 @@ @param e close event (QCloseEvent) """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -160,8 +163,10 @@ Private slot called when the process finished or the user pressed the button. """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000)
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -12,8 +12,10 @@ from PyQt5.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer from PyQt5.QtGui import QCursor -from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QTreeWidgetItem, \ - QAbstractButton, QMenu, QHeaderView, QApplication, QLineEdit +from PyQt5.QtWidgets import ( + QWidget, QDialogButtonBox, QTreeWidgetItem, QAbstractButton, QMenu, + QHeaderView, QApplication, QLineEdit +) from E5Gui import E5MessageBox @@ -95,8 +97,10 @@ @param e close event (QCloseEvent) """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -221,8 +225,10 @@ Private slot called when the process finished or the user pressed the button. """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -331,8 +337,9 @@ totals = {"files": 0, "additions": 0, "deletions": 0} fileData = [] for line in output.splitlines(): - additions, deletions, name = \ + additions, deletions, name = ( line.strip().split(None, 2) + ) totals["files"] += 1 if additions != "-": totals["additions"] += int(additions)
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -14,8 +14,10 @@ from PyQt5.QtCore import pyqtSlot, Qt, QProcess, QTimer, QSize from PyQt5.QtGui import QTextCursor -from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QMenu, QHeaderView, \ - QTreeWidgetItem, QLineEdit, QInputDialog +from PyQt5.QtWidgets import ( + QWidget, QDialogButtonBox, QMenu, QHeaderView, QTreeWidgetItem, QLineEdit, + QInputDialog +) from E5Gui.E5Application import e5App from E5Gui import E5MessageBox @@ -264,8 +266,10 @@ @param e close event (QCloseEvent) """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -337,8 +341,10 @@ itm.setTextAlignment(self.__statusIndexColumn, Qt.AlignHCenter) itm.setTextAlignment(self.__pathColumn, Qt.AlignLeft) - if status not in self.ConflictStates + ["??", "!!"] and \ - statusIndexText in self.modifiedIndicators: + if ( + status not in self.ConflictStates + ["??", "!!"] and + statusIndexText in self.modifiedIndicators + ): itm.setFlags(itm.flags() | Qt.ItemIsUserCheckable) itm.setCheckState(self.__toBeCommittedColumn, Qt.Checked) else: @@ -420,8 +426,10 @@ Private slot called when the process finished or the user pressed the button. """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -912,8 +920,10 @@ items = [] for index in range(self.statusList.topLevelItemCount()): itm = self.statusList.topLevelItem(index) - if itm.flags() & Qt.ItemIsUserCheckable and \ - itm.checkState(self.__toBeCommittedColumn) == Qt.Unchecked: + if ( + itm.flags() & Qt.ItemIsUserCheckable and + itm.checkState(self.__toBeCommittedColumn) == Qt.Unchecked + ): items.append(itm) return items @@ -969,8 +979,10 @@ """ stageableItems = [] for itm in self.statusList.selectedItems(): - if itm.text(self.__statusWorkColumn) in \ - self.modifiedIndicators + self.unmergedIndicators: + if ( + itm.text(self.__statusWorkColumn) in + self.modifiedIndicators + self.unmergedIndicators + ): stageableItems.append(itm) return stageableItems
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py Sat Sep 21 22:03:03 2019 +0200 @@ -122,8 +122,10 @@ self.statusList.append(" {0}".format(name)) self.reportedStates = states - return True, \ + return ( + True, self.tr("Git status checked successfully") + ) def _getInfo(self): """
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -56,8 +56,10 @@ self.submoduleUrlDirCompleter = E5DirCompleter(self.submoduleUrlCombo) self.submoduleDirCompleter = E5DirCompleter(self.submoduleDirEdit) - ipath = Preferences.getMultiProject("Workspace") or \ + ipath = ( + Preferences.getMultiProject("Workspace") or Utilities.getHomeDir() + ) self.__initPaths = [ Utilities.fromNativeSeparators(ipath), Utilities.fromNativeSeparators(ipath) + "/", @@ -189,9 +191,11 @@ """ if path == self.__repodir: return "" - elif Utilities.normcasepath(Utilities.toNativeSeparators(path))\ + elif ( + Utilities.normcasepath(Utilities.toNativeSeparators(path)) .startswith(Utilities.normcasepath( - Utilities.toNativeSeparators(self.__repodir + "/"))): + Utilities.toNativeSeparators(self.__repodir + "/"))) + ): relpath = path[len(self.__repodir):] if relpath.startswith(("/", "\\")): relpath = relpath[1:]
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -39,8 +39,10 @@ """ Private slot to update the state of the OK button. """ - enable = self.allCheckBox.isChecked() or \ + enable = ( + self.allCheckBox.isChecked() or len(self.submodulesList.selectedItems()) > 0 + ) self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enable) @pyqtSlot(bool)
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -12,8 +12,9 @@ import os from PyQt5.QtCore import pyqtSlot, Qt, QProcess -from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem, \ - QHeaderView, QAbstractButton +from PyQt5.QtWidgets import ( + QDialog, QDialogButtonBox, QTreeWidgetItem, QHeaderView, QAbstractButton +) from .Ui_GitSubmodulesStatusDialog import Ui_GitSubmodulesStatusDialog
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -10,8 +10,9 @@ from PyQt5.QtWidgets import QDialog -from .Ui_GitSubmodulesSummaryOptionsDialog import \ +from .Ui_GitSubmodulesSummaryOptionsDialog import ( Ui_GitSubmodulesSummaryOptionsDialog +) class GitSubmodulesSummaryOptionsDialog(QDialog,
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -10,8 +10,9 @@ from PyQt5.QtWidgets import QDialog -from .Ui_GitSubmodulesUpdateOptionsDialog import \ +from .Ui_GitSubmodulesUpdateOptionsDialog import ( Ui_GitSubmodulesUpdateOptionsDialog +) class GitSubmodulesUpdateOptionsDialog(QDialog,
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -11,8 +11,9 @@ import os from PyQt5.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication -from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QHeaderView, \ - QTreeWidgetItem, QLineEdit +from PyQt5.QtWidgets import ( + QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QLineEdit +) from E5Gui import E5MessageBox @@ -59,8 +60,10 @@ @param e close event (QCloseEvent) """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -142,8 +145,10 @@ Private slot called when the process finished or the user pressed the button. """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000)
--- a/eric6/Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py Sat Sep 21 22:03:03 2019 +0200 @@ -557,16 +557,16 @@ """ Private method to open the configuration dialog. """ - e5App().getObject("UserInterface")\ - .showPreferences("zzz_gitPage") + e5App().getObject("UserInterface").showPreferences("zzz_gitPage") def __GitForget(self): """ Private slot called by the context menu to remove the selected file from the Git repository leaving a copy in the project directory. """ - from UI.DeleteFilesConfirmationDialog import \ + from UI.DeleteFilesConfirmationDialog import ( DeleteFilesConfirmationDialog + ) if self.isTranslationsBrowser: items = self.browser.getSelectedItems([ProjectBrowserFileItem]) names = [itm.fileName() for itm in items]
--- a/eric6/Plugins/VcsPlugins/vcsGit/git.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/git.py Sat Sep 21 22:03:03 2019 +0200 @@ -204,8 +204,8 @@ else: if finished: errMsg = self.tr( - "The git process finished with the exit code {0}")\ - .format(process.exitCode()) + "The git process finished with the exit code {0}" + ).format(process.exitCode()) else: errMsg = self.tr( "The git process did not finish within 30s.") @@ -407,14 +407,16 @@ if os.path.isdir(nam): project = e5App().getObject("Project") if nam == project.getProjectPath(): - ok &= \ + ok &= ( project.checkAllScriptsDirty( - reportSyntaxErrors=True) and \ + reportSyntaxErrors=True) and project.checkDirty() + ) continue elif os.path.isfile(nam): - editor = \ + editor = ( e5App().getObject("ViewManager").getOpenEditor(nam) + ) if editor: ok &= editor.checkDirty() if not ok: @@ -875,8 +877,9 @@ project = e5App().getObject("Project") names = [project.getRelativePath(nam) for nam in names] if names[0]: - from UI.DeleteFilesConfirmationDialog import \ + from UI.DeleteFilesConfirmationDialog import ( DeleteFilesConfirmationDialog + ) dlg = DeleteFilesConfirmationDialog( self.parent(), self.tr("Revert changes"), @@ -924,8 +927,9 @@ self.gitGetCurrentBranch(repodir), self.gitGetBranchesList(repodir, remotes=True)) if dlg.exec_() == QDialog.Accepted: - commit, doCommit, commitMessage, addLog, diffStat = \ + commit, doCommit, commitMessage, addLog, diffStat = ( dlg.getParameters() + ) args = self.initCommand("merge") if doCommit: args.append("--commit") @@ -1274,8 +1278,9 @@ if output: info = [] (commit, parents, author, authorMail, authorDate, - committer, committerMail, committerDate, refs, subject) = \ + committer, committerMail, committerDate, refs, subject) = ( output.splitlines() + ) tags = [] branches = [] for name in refs.strip()[1:-1].split(","): @@ -1589,8 +1594,9 @@ if os.path.splitdrive(repodir)[1] == os.sep: return - from .GitRevisionsSelectionDialog import \ + from .GitRevisionsSelectionDialog import ( GitRevisionsSelectionDialog + ) dlg = GitRevisionsSelectionDialog(self.gitGetTagsList(repodir), self.gitGetBranchesList(repodir)) if dlg.exec_() == QDialog.Accepted: @@ -2131,8 +2137,9 @@ self.gitGetBranchesList(repodir, allBranches=True), revision, branchName, branchOp) if dlg.exec_() == QDialog.Accepted: - branchOp, branch, revision, newBranch, remoteBranch, force = \ + branchOp, branch, revision, newBranch, remoteBranch, force = ( dlg.getParameters() + ) else: return False, False @@ -2793,8 +2800,10 @@ for line in output.splitlines(): name, urlmode = line.strip().split(None, 1) url, mode = urlmode.rsplit(None, 1) - if forFetch and mode == "(fetch)" or \ - (not forFetch) and mode == "(push)": + if ( + (forFetch and mode == "(fetch)") or + ((not forFetch) and mode == "(push)") + ): remotesList.append((name, url)) return remotesList @@ -2890,8 +2899,9 @@ @param projectDir name of the project directory (string) """ if self.remotesDialog is None: - from .GitRemoteRepositoriesDialog import \ + from .GitRemoteRepositoriesDialog import ( GitRemoteRepositoriesDialog + ) self.remotesDialog = GitRemoteRepositoriesDialog(self) self.remotesDialog.show() self.remotesDialog.raise_() @@ -3126,8 +3136,9 @@ from .GitCherryPickDialog import GitCherryPickDialog dlg = GitCherryPickDialog(commits) if dlg.exec_() == QDialog.Accepted: - commits, cherrypickInfo, signoff, nocommit = \ + commits, cherrypickInfo, signoff, nocommit = ( dlg.getData() + ) args = self.initCommand("cherry-pick") args.append("-Xpatience") @@ -4090,12 +4101,14 @@ paths = [submodule["path"] for submodule in self.__gitSubmodulesList(repodir)] - from .GitSubmodulesUpdateOptionsDialog import \ + from .GitSubmodulesUpdateOptionsDialog import ( GitSubmodulesUpdateOptionsDialog + ) dlg = GitSubmodulesUpdateOptionsDialog(paths) if dlg.exec_() == QDialog.Accepted: - procedure, init, remote, noFetch, force, submodulePaths = \ + procedure, init, remote, noFetch, force, submodulePaths = ( dlg.getData() + ) args = self.initCommand("submodule") args.append("update") @@ -4182,8 +4195,9 @@ paths = [submodule["path"] for submodule in self.__gitSubmodulesList(repodir)] - from .GitSubmodulesSummaryOptionsDialog import \ + from .GitSubmodulesSummaryOptionsDialog import ( GitSubmodulesSummaryOptionsDialog + ) dlg = GitSubmodulesSummaryOptionsDialog(paths) if dlg.exec_() == QDialog.Accepted: submodulePaths, superProject, index, commit, limit = dlg.getData()
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/ProjectHelper.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/ProjectHelper.py Sat Sep 21 22:03:03 2019 +0200 @@ -76,5 +76,5 @@ """ Private slot used to close arbitrary heads. """ - self.vcs.getExtensionObject("closehead")\ - .hgCloseheads(self.project.getProjectPath()) + self.vcs.getExtensionObject("closehead").hgCloseheads( + self.project.getProjectPath())
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Sat Sep 21 22:03:03 2019 +0200 @@ -10,8 +10,9 @@ from PyQt5.QtCore import pyqtSlot -from Preferences.ConfigurationPages.ConfigurationPageBase import \ +from Preferences.ConfigurationPages.ConfigurationPageBase import ( ConfigurationPageBase +) from .Ui_MercurialPage import Ui_MercurialPage from Utilities import supportedCodecs
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py Sat Sep 21 22:03:03 2019 +0200 @@ -86,8 +86,8 @@ """ Private slot used to fetch changes from a remote repository. """ - shouldReopen = self.vcs.getExtensionObject("fetch")\ - .hgFetch(self.project.getProjectPath()) + shouldReopen = self.vcs.getExtensionObject("fetch").hgFetch( + self.project.getProjectPath()) if shouldReopen: res = E5MessageBox.yesNo( None,
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -10,10 +10,12 @@ import os -from PyQt5.QtCore import pyqtSlot, QProcess, QTimer, Qt, QRegExp, \ - QCoreApplication -from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QHeaderView, \ - QTreeWidgetItem, QLineEdit +from PyQt5.QtCore import ( + pyqtSlot, QProcess, QTimer, Qt, QRegExp, QCoreApplication +) +from PyQt5.QtWidgets import ( + QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QLineEdit +) from E5Gui import E5MessageBox @@ -61,8 +63,10 @@ if self.__hgClient.isExecuting(): self.__hgClient.cancel() else: - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -130,8 +134,10 @@ Private slot called when the process finished or the user pressed the button. """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -272,8 +278,10 @@ Private slot handling changes of the selection. """ selectedItems = self.signaturesList.selectedItems() - if len(selectedItems) == 1 and \ - self.signaturesList.indexOfTopLevelItem(selectedItems[0]) != -1: + if ( + len(selectedItems) == 1 and + self.signaturesList.indexOfTopLevelItem(selectedItems[0]) != -1 + ): self.verifyButton.setEnabled(True) else: self.verifyButton.setEnabled(False) @@ -283,10 +291,12 @@ """ Private slot to verify the signatures of the selected revision. """ - rev = self.signaturesList.selectedItems()[0].text(0)\ + rev = ( + self.signaturesList.selectedItems()[0].text(0) .split(":")[0].strip() - self.vcs.getExtensionObject("gpg")\ - .hgGpgVerifySignatures(self.__path, rev) + ) + self.vcs.getExtensionObject("gpg").hgGpgVerifySignatures( + self.__path, rev) @pyqtSlot(str) def on_categoryCombo_activated(self, txt):
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py Sat Sep 21 22:03:03 2019 +0200 @@ -106,19 +106,19 @@ """ Private slot used to list all signed changesets. """ - self.vcs.getExtensionObject("gpg")\ - .hgGpgSignatures(self.project.getProjectPath()) + self.vcs.getExtensionObject("gpg").hgGpgSignatures( + self.project.getProjectPath()) def __hgGpgVerifySignatures(self): """ Private slot used to verify the signatures of a revision. """ - self.vcs.getExtensionObject("gpg")\ - .hgGpgVerifySignatures(self.project.getProjectPath()) + self.vcs.getExtensionObject("gpg").hgGpgVerifySignatures( + self.project.getProjectPath()) def __hgGpgSign(self): """ Private slot used to sign a revision. """ - self.vcs.getExtensionObject("gpg")\ - .hgGpgSign(self.project.getProjectPath()) + self.vcs.getExtensionObject("gpg").hgGpgSign( + self.project.getProjectPath())
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py Sat Sep 21 22:03:03 2019 +0200 @@ -104,8 +104,9 @@ self.vcs.hgGetBranchesList(repodir), self.vcs.hgGetBookmarksList(repodir)) if dlg.exec_() == QDialog.Accepted: - revision, noCommit, message, keyId, local, force = \ + revision, noCommit, message, keyId, local, force = ( dlg.getData() + ) if revision: revisions = [revision] else:
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -12,8 +12,9 @@ import re from PyQt5.QtCore import pyqtSlot, QProcess, QTimer, Qt, QCoreApplication -from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QHeaderView, \ - QLineEdit, QTreeWidgetItem +from PyQt5.QtWidgets import ( + QDialog, QDialogButtonBox, QHeaderView, QLineEdit, QTreeWidgetItem +) from E5Gui import E5MessageBox @@ -73,8 +74,10 @@ if self.__hgClient.isExecuting(): self.__hgClient.cancel() else: - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -149,8 +152,10 @@ Private slot called when the process finished or the user pressed the button. """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -81,8 +81,9 @@ self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) - self.__projectPath = \ + self.__projectPath = ( vcs.getPlugin().getProjectHelper().getProject().getProjectPath() + ) msh = self.minimumSizeHint() self.resize(max(self.width(), msh.width()), msh.height())
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -11,8 +11,9 @@ import os from PyQt5.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication -from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QHeaderView, \ - QTreeWidgetItem, QLineEdit +from PyQt5.QtWidgets import ( + QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QLineEdit +) from E5Gui import E5MessageBox @@ -79,8 +80,10 @@ if self.__hgClient.isExecuting(): self.__hgClient.cancel() else: - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -154,8 +157,10 @@ Private slot called when the process finished or the user pressed the button. """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -10,10 +10,13 @@ import os -from PyQt5.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication, \ - QPoint -from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QHeaderView, \ - QTreeWidgetItem, QLineEdit, QMenu, QInputDialog +from PyQt5.QtCore import ( + pyqtSlot, QProcess, Qt, QTimer, QCoreApplication, QPoint +) +from PyQt5.QtWidgets import ( + QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QLineEdit, QMenu, + QInputDialog +) from E5Gui.E5Application import e5App from E5Gui import E5MessageBox @@ -76,8 +79,10 @@ if self.__hgClient.isExecuting(): self.__hgClient.cancel() else: - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -159,8 +164,10 @@ Private slot called when the process finished or the user pressed the button. """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgClient.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgClient.py Sat Sep 21 22:03:03 2019 +0200 @@ -10,8 +10,9 @@ import struct import io -from PyQt5.QtCore import QProcess, QObject, QByteArray, QCoreApplication, \ - QThread +from PyQt5.QtCore import ( + QProcess, QObject, QByteArray, QCoreApplication, QThread +) from PyQt5.QtWidgets import QDialog from .HgUtilities import prepareProcess @@ -176,8 +177,10 @@ @return tuple of channel designator and channel data (string, integer or string or bytes) """ - if self.__server.bytesAvailable() > 0 or \ - self.__server.waitForReadyRead(10000): + if ( + self.__server.bytesAvailable() > 0 or + self.__server.waitForReadyRead(10000) + ): data = bytes(self.__server.peek(HgClient.OutputFormatSize)) if not data or len(data) < HgClient.OutputFormatSize: return "", "" @@ -188,8 +191,10 @@ self.__server.read(HgClient.OutputFormatSize) return channel, length else: - if self.__server.bytesAvailable() < \ - HgClient.OutputFormatSize + length: + if ( + self.__server.bytesAvailable() < + HgClient.OutputFormatSize + length + ): return "", "" self.__server.read(HgClient.OutputFormatSize) data = self.__server.read(length)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -126,8 +126,8 @@ author = self.authorComboBox.currentText() if author: - commitAuthors = \ - self.__vcs.getPlugin().getPreferences('CommitAuthors') + commitAuthors = self.__vcs.getPlugin().getPreferences( + 'CommitAuthors') if author in commitAuthors: commitAuthors.remove(author) commitAuthors.insert(0, author) @@ -137,8 +137,8 @@ 'CommitAuthors', commitAuthors) if self.dateTimeGroup.isChecked(): - dateTime = \ - self.dateTimeEdit.dateTime().toString("yyyy-MM-dd hh:mm") + dateTime = self.dateTimeEdit.dateTime().toString( + "yyyy-MM-dd hh:mm") else: dateTime = ""
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -12,8 +12,10 @@ import os from PyQt5.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer -from PyQt5.QtWidgets import QAbstractButton, QDialogButtonBox, QHeaderView, \ - QTreeWidgetItem, QLineEdit, QApplication, QWidget +from PyQt5.QtWidgets import ( + QAbstractButton, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QLineEdit, + QApplication, QWidget +) from E5Gui import E5MessageBox from E5Gui.E5Application import e5App @@ -79,8 +81,10 @@ if self.__hgClient.isExecuting(): self.__hgClient.cancel() else: - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -170,8 +174,10 @@ Private slot called when the process finished or the user pressed the button. """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -10,8 +10,9 @@ import os -from PyQt5.QtCore import QProcess, QTimer, pyqtSlot, Qt, QCoreApplication, \ - QProcessEnvironment +from PyQt5.QtCore import ( + QProcess, QTimer, pyqtSlot, Qt, QCoreApplication, QProcessEnvironment +) from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QLineEdit from E5Gui import E5MessageBox @@ -67,8 +68,10 @@ Private slot called when the process finished or the user pressed the button. """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -84,9 +87,11 @@ self.buttonBox.button(QDialogButtonBox.Close).setFocus( Qt.OtherFocusReason) - if Preferences.getVCS("AutoClose") and \ - self.normal and \ - self.errors.toPlainText() == "": + if ( + Preferences.getVCS("AutoClose") and + self.normal and + self.errors.toPlainText() == "" + ): self.accept() def on_buttonBox_clicked(self, button): @@ -130,11 +135,13 @@ self.intercept = False self.__hasAddOrDelete = False - if args[0] in ["fetch", "qpush", "qpop", "qgoto", "rebase", - "update", "import", "revert", "graft", "shelve", - "unshelve", "strip", "histedit"] or \ - (args[0] in ["pull", "unbundle"] and - ("--update" in args[1:] or "--rebase" in args[1:])): + if ( + args[0] in ["fetch", "qpush", "qpop", "qgoto", "rebase", + "update", "import", "revert", "graft", "shelve", + "unshelve", "strip", "histedit"] or + (args[0] in ["pull", "unbundle"] and + ("--update" in args[1:] or "--rebase" in args[1:])) + ): self.__updateCommand = True else: self.__updateCommand = False
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgDiffGenerator.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgDiffGenerator.py Sat Sep 21 22:03:03 2019 +0200 @@ -49,8 +49,10 @@ if self.__hgClient.isExecuting(): self.__hgClient.cancel() else: - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -209,8 +211,10 @@ @param line output line to be processed (string) """ - if line.startswith("--- ") or \ - line.startswith("+++ "): + if ( + line.startswith("--- ") or + line.startswith("+++ ") + ): self.__processFileLine(line) self.__output.append(line)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -59,8 +59,10 @@ enabled = False elif self.patternEdit.text() == "": enabled = False - elif self.changesetsEdit.toPlainText() == "" and \ - self.bookmarkCombo.currentText() == "": + elif ( + self.changesetsEdit.toPlainText() == "" and + self.bookmarkCombo.currentText() == "" + ): enabled = False self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enabled)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -47,9 +47,11 @@ """ enable = self.revisionsEdit.toPlainText() != "" if self.userGroup.isChecked(): - enable = enable and \ + enable = ( + enable and (self.currentUserCheckBox.isChecked() or self.userEdit.text() != "") + ) self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enable)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -12,12 +12,16 @@ import re import collections -from PyQt5.QtCore import pyqtSlot, Qt, QDate, QProcess, QTimer, QRegExp, \ - QSize, QPoint, QFileInfo -from PyQt5.QtGui import QCursor, QColor, QPixmap, QPainter, QPen, QBrush, \ - QIcon, QTextCursor -from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QHeaderView, \ - QTreeWidgetItem, QApplication, QLineEdit, QMenu, QInputDialog +from PyQt5.QtCore import ( + pyqtSlot, Qt, QDate, QProcess, QTimer, QRegExp, QSize, QPoint, QFileInfo +) +from PyQt5.QtGui import ( + QCursor, QColor, QPixmap, QPainter, QPen, QBrush, QIcon, QTextCursor +) +from PyQt5.QtWidgets import ( + QWidget, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QApplication, + QLineEdit, QMenu, QInputDialog +) from E5Gui.E5Application import e5App from E5Gui import E5MessageBox, E5FileDialog @@ -430,8 +434,10 @@ if self.__hgClient.isExecuting(): self.__hgClient.cancel() else: - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -737,8 +743,10 @@ if self.__bundle: args.append("--repository") args.append(self.__bundle) - elif self.vcs.bundleFile and \ - os.path.exists(self.vcs.bundleFile): + elif ( + self.vcs.bundleFile and + os.path.exists(self.vcs.bundleFile) + ): args.append("--repository") args.append(self.vcs.bundleFile) args.append("--template") @@ -1044,10 +1052,9 @@ itm.setData(0, self.__incomingRole, self.commandMode == "incoming") if self.logTree.topLevelItemCount() > 1: - topedges = \ - self.logTree.topLevelItem( - self.logTree.indexOfTopLevelItem(itm) - 1)\ - .data(0, self.__edgesRole) + topedges = self.logTree.topLevelItem( + self.logTree.indexOfTopLevelItem(itm) - 1 + ).data(0, self.__edgesRole) else: topedges = None @@ -1101,9 +1108,11 @@ if startRev is not None: args.append('--rev') args.append('{0}:0'.format(startRev)) - if not self.projectMode and \ - not self.fname == "." and \ - not self.stopCheckBox.isChecked(): + if ( + not self.projectMode and + not self.fname == "." and + not self.stopCheckBox.isChecked() + ): args.append('--follow') if self.commandMode == "log": args.append('--copies') @@ -1137,23 +1146,29 @@ else: err = "" if err: - if self.commandMode == "incoming" and \ - self.initialCommandMode == "full_log": + if ( + self.commandMode == "incoming" and + self.initialCommandMode == "full_log" + ): # ignore the error self.commandMode = "log" else: self.__showError(err) - elif self.commandMode != "incoming" or \ + elif ( + self.commandMode != "incoming" or (self.vcs.bundleFile and - os.path.exists(self.vcs.bundleFile)) or \ - self.__bundle: + os.path.exists(self.vcs.bundleFile)) or + self.__bundle + ): out, err = self.__hgClient.runcommand(args) self.buf = out.splitlines(True) if err: self.__showError(err) self.__processBuffer() - elif self.commandMode == "incoming" and \ - self.initialCommandMode == "full_log": + elif ( + self.commandMode == "incoming" and + self.initialCommandMode == "full_log" + ): # no incoming changesets, just switch to log mode self.commandMode = "log" self.__finish() @@ -1170,10 +1185,12 @@ if procStarted: process.waitForFinished(30000) - if self.commandMode != "incoming" or \ + if ( + self.commandMode != "incoming" or (self.vcs.bundleFile and - os.path.exists(self.vcs.bundleFile)) or \ - self.__bundle: + os.path.exists(self.vcs.bundleFile)) or + self.__bundle + ): self.process.start('hg', args) procStarted = self.process.waitForStarted(5000) if not procStarted: @@ -1255,8 +1272,10 @@ Private slot called when the process finished or the user pressed the button. """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -1309,9 +1328,10 @@ elif key == "user": log["author"] = value.strip() elif key == "parents": - log["parents"] = \ - [int(x.split(":", 1)[0]) - for x in value.strip().split()] + log["parents"] = [ + int(x.split(":", 1)[0]) + for x in value.strip().split() + ] elif key == "date": log["date"] = " ".join(value.strip().split()[:2]) elif key == "description": @@ -1386,8 +1406,10 @@ log["parents"], log["branches"], log["tags"], log["phase"], log["bookmarks"], log["latesttag"]) dt = QDate.fromString(log["date"], Qt.ISODate) - if not self.__maxDate.isValid() and \ - not self.__minDate.isValid(): + if ( + not self.__maxDate.isValid() and + not self.__minDate.isValid() + ): self.__maxDate = dt self.__minDate = dt else: @@ -1540,8 +1562,10 @@ selectedItems = self.logTree.selectedItems() if len(selectedItems) == 1: currentItem = selectedItems[0] - rev2 = currentItem.text(self.RevisionColumn).split(":", 1)[0]\ + rev2 = ( + currentItem.text(self.RevisionColumn).split(":", 1)[0] .strip() + ) parents = currentItem.data(0, self.__parentsRole) if parents: parentLinks = [] @@ -1587,9 +1611,11 @@ public += 1 # step 2: set the status of the phase action - if public == 0 and \ - ((secret > 0 and draft == 0) or - (secret == 0 and draft > 0)): + if ( + public == 0 and + ((secret > 0 and draft == 0) or + (secret == 0 and draft > 0)) + ): self.__phaseAct.setEnabled(True) else: self.__phaseAct.setEnabled(False) @@ -1768,8 +1794,9 @@ index2 = self.logTree.indexOfTopLevelItem(selectedItems[1]) if index1 > index2: # Swap the entries - selectedItems[0], selectedItems[1] = \ + selectedItems[0], selectedItems[1] = ( selectedItems[1], selectedItems[0] + ) html = "{0}<hr/>{1}".format( self.__generateDetailsTableText(selectedItems[0]), self.__generateDetailsTableText(selectedItems[1]), @@ -2028,12 +2055,14 @@ txt = "\n".join(topItem.data(0, self.__messageRole)) else: txt = topItem.text(fieldIndex) - if topItem.text(self.DateColumn) <= to_ and \ - topItem.text(self.DateColumn) >= from_ and \ - (branch == self.__allBranchesFilter or - topItem.text(self.BranchColumn) in - [branch, closedBranch]) and \ - searchRx.indexIn(txt) > -1: + if ( + topItem.text(self.DateColumn) <= to_ and + topItem.text(self.DateColumn) >= from_ and + (branch == self.__allBranchesFilter or + topItem.text(self.BranchColumn) in + [branch, closedBranch]) and + searchRx.indexIn(txt) > -1 + ): topItem.setHidden(False) if topItem is currentItem: self.on_logTree_currentItemChanged(topItem, None) @@ -2317,8 +2346,9 @@ if len([itm for itm in self.logTree.selectedItems() if not itm.data(0, self.__incomingRole)]) == 1: itm = self.logTree.selectedItems()[0] - rev, changeset = \ + rev, changeset = ( itm.text(self.RevisionColumn).strip().split(":", 1) + ) bookmark, ok = QInputDialog.getText( self, self.tr("Define Bookmark"), @@ -2339,8 +2369,9 @@ if len([itm for itm in self.logTree.selectedItems() if not itm.data(0, self.__incomingRole)]) == 1: itm = self.logTree.selectedItems()[0] - rev, changeset = \ + rev, changeset = ( itm.text(self.RevisionColumn).strip().split(":", 1) + ) bookmarksList = self.vcs.hgGetBookmarksList(self.repodir) bookmark, ok = QInputDialog.getItem( self, @@ -2515,8 +2546,8 @@ } elif len(selectedItems) == 1: # the selected changeset is the base - rev = selectedItems[0].text(self.RevisionColumn)\ - .split(":", 1)[0].strip() + rev = selectedItems[0].text(self.RevisionColumn).split( + ":", 1)[0].strip() bundleData = { "revs": [], "base": rev,
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -52,8 +52,10 @@ UI.PixmapCache.getIcon("editDelete.png")) self.vcsUrlPicker.setText("") - ipath = Preferences.getMultiProject("Workspace") or \ + ipath = ( + Preferences.getMultiProject("Workspace") or Utilities.getHomeDir() + ) self.__initPaths = [ Utilities.fromNativeSeparators(ipath), Utilities.fromNativeSeparators(ipath) + "/",
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -12,8 +12,9 @@ from PyQt5.QtCore import QProcess, Qt, QSize from PyQt5.QtGui import QTextCursor, QBrush -from PyQt5.QtWidgets import QAction, QToolBar, QPlainTextEdit, QSpinBox, \ - QComboBox +from PyQt5.QtWidgets import ( + QAction, QToolBar, QPlainTextEdit, QSpinBox, QComboBox +) from E5Gui.E5Application import e5App from E5Gui import E5MessageBox @@ -148,8 +149,10 @@ """ Private slot to stop the Mercurial server. """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() self.process.waitForFinished(5000) if self.process.state() != QProcess.NotRunning:
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -13,8 +13,9 @@ from PyQt5.QtCore import pyqtSlot, Qt, QProcess, QTimer, QSize from PyQt5.QtGui import QTextCursor -from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QMenu, QHeaderView, \ - QTreeWidgetItem, QLineEdit +from PyQt5.QtWidgets import ( + QWidget, QDialogButtonBox, QMenu, QHeaderView, QTreeWidgetItem, QLineEdit +) from E5Gui.E5Application import e5App from E5Gui import E5MessageBox @@ -215,8 +216,10 @@ if self.__hgClient.isExecuting(): self.__hgClient.cancel() else: - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -394,8 +397,10 @@ Private slot called when the process finished or the user pressed the button. """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -852,8 +857,10 @@ items = [] for index in range(self.statusList.topLevelItemCount()): itm = self.statusList.topLevelItem(index) - if itm.flags() & Qt.ItemIsUserCheckable and \ - itm.checkState(self.__toBeCommittedColumn) == Qt.Unchecked: + if ( + itm.flags() & Qt.ItemIsUserCheckable and + itm.checkState(self.__toBeCommittedColumn) == Qt.Unchecked + ): items.append(itm) return items
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py Sat Sep 21 22:03:03 2019 +0200 @@ -135,8 +135,10 @@ self.statusList.append(" {0}".format(name)) self.reportedStates = states - return True, \ + return ( + True, self.tr("Mercurial status checked successfully") + ) def _getInfo(self): """
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -57,8 +57,10 @@ @param e close event (QCloseEvent) """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -120,8 +122,10 @@ Private slot called when the process finished or the user pressed the button. """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -410,8 +414,8 @@ "%n branch head(s)", "", infoDict["update"][2]) uinfo = self.tr( "{0}<br/>{1}<br/>Merge required", - "0 is changesets, 1 is branch heads")\ - .format(uinfo1, uinfo2) + "0 is changesets, 1 is branch heads" + ).format(uinfo1, uinfo2) else: uinfo = self.tr("unknown status") info.append(self.tr(
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -10,10 +10,13 @@ import os -from PyQt5.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication, \ - QPoint -from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QHeaderView, \ - QTreeWidgetItem, QLineEdit, QMenu, QAbstractItemView +from PyQt5.QtCore import ( + pyqtSlot, QProcess, Qt, QTimer, QCoreApplication, QPoint +) +from PyQt5.QtWidgets import ( + QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QLineEdit, QMenu, + QAbstractItemView +) from E5Gui.E5Application import e5App from E5Gui import E5MessageBox @@ -79,8 +82,10 @@ if self.__hgClient.isExecuting(): self.__hgClient.cancel() else: - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -168,8 +173,10 @@ Private slot called when the process finished or the user pressed the button. """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -511,8 +518,9 @@ branches = [itm.text(3) for itm in self.tagsList.selectedItems() if itm.text(3) != "default"] - from UI.DeleteFilesConfirmationDialog import \ + from UI.DeleteFilesConfirmationDialog import ( DeleteFilesConfirmationDialog + ) dlg = DeleteFilesConfirmationDialog( self.parent(), self.tr("Close Branches"),
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -20,10 +20,12 @@ import Globals from .HgUtilities import getConfigPath -from .HgUserConfigHostFingerprintDialog import \ +from .HgUserConfigHostFingerprintDialog import ( HgUserConfigHostFingerprintDialog -from .HgUserConfigHostMinimumProtocolDialog import \ +) +from .HgUserConfigHostMinimumProtocolDialog import ( HgUserConfigHostMinimumProtocolDialog +) from .Ui_HgUserConfigDialog import Ui_HgUserConfigDialog @@ -182,8 +184,9 @@ ############################################################### if "largefiles" not in self.__config: self.__config["largefiles"] = {} - self.__config["largefiles"]["minsize"] = \ + self.__config["largefiles"]["minsize"] = ( str(self.lfFileSizeSpinBox.value()) + ) lfFilePatterns = self.lfFilePatternsEdit.text() if lfFilePatterns: self.__config["largefiles"]["patterns"] = lfFilePatterns @@ -215,8 +218,9 @@ "passwd": self.proxyPasswordEdit.text() } if self.proxyBypassEdit.text(): - self.__config["http_proxy"]["no"] = \ + self.__config["http_proxy"]["no"] = ( self.proxyBypassEdit.text() + ) else: if "http_proxy" in self.__config: del self.__config["http_proxy"] @@ -240,8 +244,9 @@ fingerprint = itm.text(1) if fingerprint.startswith("sha1:"): fingerprint = fingerprint[5:] - self.__config["hostfingerprints"][itm.text(0)] = \ + self.__config["hostfingerprints"][itm.text(0)] = ( fingerprint + ) else: if "hostfingerprints" in self.__config: del self.__config["hostfingerprints"] @@ -263,8 +268,9 @@ fingerprints = self.__assembleFingerprints() for host in fingerprints: key = "{0}:fingerprints".format(host) - self.__config["hostsecurity"][key] = \ + self.__config["hostsecurity"][key] = ( ", ".join(fingerprints[host]) + ) else: self.__clearFingerprints() @@ -272,16 +278,18 @@ disabletls10warning = "true" else: disabletls10warning = "false" - self.__config["hostsecurity"]["disabletls10warning"] = \ + self.__config["hostsecurity"]["disabletls10warning"] = ( disabletls10warning + ) if self.minimumProtocolComboBox.currentIndex() == 0: self.__config.remove_option("hostsecurity", "minimumprotocol") else: minimumProtocol = self.minimumProtocolComboBox.itemData( self.minimumProtocolComboBox.currentIndex()) - self.__config["hostsecurity"]["minimumprotocol"] = \ + self.__config["hostsecurity"]["minimumprotocol"] = ( minimumProtocol + ) if self.protocolsList.topLevelItemCount() > 0: self.__clearMinimumProtocols() @@ -392,8 +400,9 @@ for key in self.__config.options("hostsecurity"): if key.endswith(":fingerprints"): host = key.replace(":fingerprints", "") - fingerprints = \ + fingerprints = ( self.__config["hostsecurity"][key].split(",") + ) for fingerprint in fingerprints: if self.__version < (3, 9, 0): # downgrade from a newer version
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -11,8 +11,9 @@ from PyQt5.QtCore import pyqtSlot from PyQt5.QtWidgets import QDialog, QDialogButtonBox -from .Ui_HgUserConfigHostFingerprintDialog import \ +from .Ui_HgUserConfigHostFingerprintDialog import ( Ui_HgUserConfigHostFingerprintDialog +) class HgUserConfigHostFingerprintDialog(
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostMinimumProtocolDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostMinimumProtocolDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -11,8 +11,9 @@ from PyQt5.QtCore import pyqtSlot from PyQt5.QtWidgets import QDialog, QDialogButtonBox -from .Ui_HgUserConfigHostMinimumProtocolDialog import \ +from .Ui_HgUserConfigHostMinimumProtocolDialog import ( Ui_HgUserConfigHostMinimumProtocolDialog +) class HgUserConfigHostMinimumProtocolDialog(
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgUtilities.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgUtilities.py Sat Sep 21 22:03:03 2019 +0200 @@ -93,8 +93,8 @@ if finished: errorMsg = QCoreApplication.translate( "HgUtilities", - "The hg process finished with the exit code {0}")\ - .format(process.exitCode()) + "The hg process finished with the exit code {0}" + ).format(process.exitCode()) else: errorMsg = QCoreApplication.translate( "HgUtilities",
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py Sat Sep 21 22:03:03 2019 +0200 @@ -125,8 +125,10 @@ """ Private slot used to start a history editing session. """ - shouldReopen = self.vcs.getExtensionObject("histedit")\ + shouldReopen = ( + self.vcs.getExtensionObject("histedit") .hgHisteditStart(self.project.getProjectPath()) + ) if shouldReopen: res = E5MessageBox.yesNo( None, @@ -140,8 +142,10 @@ """ Private slot used to continue an interrupted history editing session. """ - shouldReopen = self.vcs.getExtensionObject("histedit")\ + shouldReopen = ( + self.vcs.getExtensionObject("histedit") .hgHisteditContinue(self.project.getProjectPath()) + ) if shouldReopen: res = E5MessageBox.yesNo( None, @@ -155,8 +159,10 @@ """ Private slot used to abort an interrupted history editing session. """ - shouldReopen = self.vcs.getExtensionObject("histedit")\ + shouldReopen = ( + self.vcs.getExtensionObject("histedit") .hgHisteditAbort(self.project.getProjectPath()) + ) if shouldReopen: res = E5MessageBox.yesNo( None, @@ -171,8 +177,10 @@ Private slot used to edit the remaining actions list of an interrupted history editing session. """ - shouldReopen = self.vcs.getExtensionObject("histedit")\ + shouldReopen = ( + self.vcs.getExtensionObject("histedit") .hgHisteditEditPlan(self.project.getProjectPath()) + ) if shouldReopen: res = E5MessageBox.yesNo( None,
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Sat Sep 21 22:03:03 2019 +0200 @@ -43,10 +43,12 @@ parent, name) # instantiate the extensions - from .ShelveExtension.ProjectBrowserHelper import \ + from .ShelveExtension.ProjectBrowserHelper import ( ShelveProjectBrowserHelper - from .LargefilesExtension.ProjectBrowserHelper import \ + ) + from .LargefilesExtension.ProjectBrowserHelper import ( LargefilesProjectBrowserHelper + ) self.__extensions = { "shelve": ShelveProjectBrowserHelper( vcsObject, browserObject, projectObject), @@ -60,8 +62,9 @@ self.__extensions[extension].menuTitle()] = extension self.__extensionMenus = {} for extension in self.__extensions: - self.__extensionMenus[extension] = \ + self.__extensionMenus[extension] = ( self.__extensions[extension].initMenus() + ) def __showExtensionMenu(self, key, controlled): """ @@ -807,8 +810,9 @@ Private slot called by the context menu to remove the selected file from the Mercurial repository leaving a copy in the project directory. """ - from UI.DeleteFilesConfirmationDialog import \ + from UI.DeleteFilesConfirmationDialog import ( DeleteFilesConfirmationDialog + ) if self.isTranslationsBrowser: items = self.browser.getSelectedItems([ProjectBrowserFileItem]) names = [itm.fileName() for itm in items] @@ -844,5 +848,4 @@ """ Private method to open the configuration dialog. """ - e5App().getObject("UserInterface")\ - .showPreferences("zzz_mercurialPage") + e5App().getObject("UserInterface").showPreferences("zzz_mercurialPage")
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Sat Sep 21 22:03:03 2019 +0200 @@ -1637,9 +1637,11 @@ for extensionName in self.extensionMenus: self.extensionMenus[extensionName].setEnabled( self.vcs.isExtensionActive(extensionName)) - if not self.extensionMenus[extensionName].isEnabled() and \ - self.extensionMenus[extensionName].menu()\ - .isTearOffMenuVisible(): + if ( + not self.extensionMenus[extensionName].isEnabled() and + self.extensionMenus[extensionName].menu() + .isTearOffMenuVisible() + ): self.extensionMenus[extensionName].menu().hideTearOffMenu() if self.vcs.version < (4, 8, 0): self.extensionMenus["closehead"].setEnabled(False)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py Sat Sep 21 22:03:03 2019 +0200 @@ -136,26 +136,26 @@ """ Private slot used to remove files not tracked by Mercurial. """ - self.vcs.getExtensionObject("purge")\ - .hgPurge(self.project.getProjectPath(), deleteAll=False) + self.vcs.getExtensionObject("purge").hgPurge( + self.project.getProjectPath(), deleteAll=False) def __hgPurgeAll(self): """ Private slot used to remove all files not tracked by Mercurial. """ - self.vcs.getExtensionObject("purge")\ - .hgPurge(self.project.getProjectPath(), deleteAll=True) + self.vcs.getExtensionObject("purge").hgPurge( + self.project.getProjectPath(), deleteAll=True) def __hgPurgeList(self): """ Private slot used to list files not tracked by Mercurial. """ - self.vcs.getExtensionObject("purge")\ - .hgPurgeList(self.project.getProjectPath(), deleteAll=False) + self.vcs.getExtensionObject("purge").hgPurgeList( + self.project.getProjectPath(), deleteAll=False) def __hgPurgeAllList(self): """ Private slot used to list all files not tracked by Mercurial. """ - self.vcs.getExtensionObject("purge")\ - .hgPurgeList(self.project.getProjectPath(), deleteAll=True) + self.vcs.getExtensionObject("purge").hgPurgeList( + self.project.getProjectPath(), deleteAll=True)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py Sat Sep 21 22:03:03 2019 +0200 @@ -98,8 +98,9 @@ message = self.tr( """Do really want to delete files not tracked by Mercurial?""") entries = self.__getEntries(repodir, deleteAll) - from UI.DeleteFilesConfirmationDialog import \ + from UI.DeleteFilesConfirmationDialog import ( DeleteFilesConfirmationDialog + ) dlg = DeleteFilesConfirmationDialog(None, title, message, entries) if dlg.exec_() == QDialog.Accepted: args = self.vcs.initCommand("purge")
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -11,8 +11,9 @@ import os from PyQt5.QtCore import pyqtSlot, Qt, QProcess, QCoreApplication -from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton, \ - QListWidgetItem +from PyQt5.QtWidgets import ( + QDialog, QDialogButtonBox, QAbstractButton, QListWidgetItem +) from E5Gui import E5MessageBox
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesGuardsSelectionDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesGuardsSelectionDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -8,8 +8,9 @@ """ -from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QListWidgetItem, \ - QAbstractItemView +from PyQt5.QtWidgets import ( + QDialog, QDialogButtonBox, QListWidgetItem, QAbstractItemView +) from .Ui_HgQueuesGuardsSelectionDialog import Ui_HgQueuesGuardsSelectionDialog
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -62,8 +62,10 @@ if self.__hgClient.isExecuting(): self.__hgClient.cancel() else: - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -117,8 +119,10 @@ Private slot called when the process finished or the user pressed the button. """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -11,8 +11,9 @@ import os from PyQt5.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication -from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QHeaderView, \ - QTreeWidgetItem, QLineEdit +from PyQt5.QtWidgets import ( + QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QLineEdit +) from E5Gui import E5MessageBox @@ -73,8 +74,10 @@ if self.__hgClient.isExecuting(): self.__hgClient.cancel() else: - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -208,8 +211,10 @@ Private slot called when the process finished or the user pressed the button. """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -53,8 +53,10 @@ if self.__hgClient.isExecuting(): self.__hgClient.cancel() else: - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -58,12 +58,16 @@ if self.__mode == HgQueuesNewPatchDialog.REFRESH_MODE: enable = self.messageEdit.toPlainText() != "" else: - enable = self.nameEdit.text() != "" and \ + enable = ( + self.nameEdit.text() != "" and self.messageEdit.toPlainText() != "" + ) if self.userGroup.isChecked(): - enable = enable and \ + enable = ( + enable and (self.currentUserCheckBox.isChecked() or self.userEdit.text() != "") + ) self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enable)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -9,8 +9,10 @@ from PyQt5.QtCore import pyqtSlot, Qt, QProcess, QCoreApplication -from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QAbstractItemView, \ - QListWidgetItem, QAbstractButton +from PyQt5.QtWidgets import ( + QDialog, QDialogButtonBox, QAbstractItemView, QListWidgetItem, + QAbstractButton +) from .Ui_HgQueuesQueueManagementDialog import Ui_HgQueuesQueueManagementDialog
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py Sat Sep 21 22:03:03 2019 +0200 @@ -781,37 +781,36 @@ """ Private slot used to create a new named patch. """ - self.vcs.getExtensionObject("mq")\ - .hgQueueNewPatch(self.project.getProjectPath()) + self.vcs.getExtensionObject("mq").hgQueueNewPatch( + self.project.getProjectPath()) def __hgQueueRefreshPatch(self): """ Private slot used to refresh the current patch. """ - self.vcs.getExtensionObject("mq")\ - .hgQueueRefreshPatch(self.project.getProjectPath()) + self.vcs.getExtensionObject("mq").hgQueueRefreshPatch( + self.project.getProjectPath()) def __hgQueueRefreshPatchMessage(self): """ Private slot used to refresh the current patch and its commit message. """ - self.vcs.getExtensionObject("mq")\ - .hgQueueRefreshPatch(self.project.getProjectPath(), - editMessage=True) + self.vcs.getExtensionObject("mq").hgQueueRefreshPatch( + self.project.getProjectPath(), editMessage=True) def __hgQueueShowPatch(self): """ Private slot used to show the contents of the current patch. """ - self.vcs.getExtensionObject("mq")\ - .hgQueueShowPatch(self.project.getProjectPath()) + self.vcs.getExtensionObject("mq").hgQueueShowPatch( + self.project.getProjectPath()) def __hgQueueShowHeader(self): """ Private slot used to show the commit message of the current patch. """ - self.vcs.getExtensionObject("mq")\ - .hgQueueShowHeader(self.project.getProjectPath()) + self.vcs.getExtensionObject("mq").hgQueueShowHeader( + self.project.getProjectPath()) def __hgQueuePushPopPatches(self, name, operation, doAll=False, named=False, force=False): @@ -827,9 +826,8 @@ is at the top of the stack (boolean) @keyparam force flag indicating a forceful pop (boolean) """ - shouldReopen = self.vcs.getExtensionObject("mq")\ - .hgQueuePushPopPatches(name, operation=operation, doAll=doAll, - named=named, force=force) + shouldReopen = self.vcs.getExtensionObject("mq").hgQueuePushPopPatches( + name, operation=operation, doAll=doAll, named=named, force=force) if shouldReopen: res = E5MessageBox.yesNo( None, @@ -965,138 +963,135 @@ """ Private slot used to show a list of applied and unapplied patches. """ - self.vcs.getExtensionObject("mq")\ - .hgQueueListPatches(self.project.getProjectPath()) + self.vcs.getExtensionObject("mq").hgQueueListPatches( + self.project.getProjectPath()) def __hgQueueFinishAppliedPatches(self): """ Private slot used to finish all applied patches. """ - self.vcs.getExtensionObject("mq")\ - .hgQueueFinishAppliedPatches(self.project.getProjectPath()) + self.vcs.getExtensionObject("mq").hgQueueFinishAppliedPatches( + self.project.getProjectPath()) def __hgQueueRenamePatch(self): """ Private slot used to rename a patch. """ - self.vcs.getExtensionObject("mq")\ - .hgQueueRenamePatch(self.project.getProjectPath()) + self.vcs.getExtensionObject("mq").hgQueueRenamePatch( + self.project.getProjectPath()) def __hgQueueDeletePatch(self): """ Private slot used to delete a patch. """ - self.vcs.getExtensionObject("mq")\ - .hgQueueDeletePatch(self.project.getProjectPath()) + self.vcs.getExtensionObject("mq").hgQueueDeletePatch( + self.project.getProjectPath()) def __hgQueueFoldUnappliedPatches(self): """ Private slot used to fold patches into the current patch. """ - self.vcs.getExtensionObject("mq")\ - .hgQueueFoldUnappliedPatches(self.project.getProjectPath()) + self.vcs.getExtensionObject("mq").hgQueueFoldUnappliedPatches( + self.project.getProjectPath()) def __hgQueueGuardsDefine(self): """ Private slot used to define guards for the current or a named patch. """ - self.vcs.getExtensionObject("mq")\ - .hgQueueGuardsDefine(self.project.getProjectPath()) + self.vcs.getExtensionObject("mq").hgQueueGuardsDefine( + self.project.getProjectPath()) def __hgQueueGuardsDropAll(self): """ Private slot used to drop all guards of the current or a named patch. """ - self.vcs.getExtensionObject("mq")\ - .hgQueueGuardsDropAll(self.project.getProjectPath()) + self.vcs.getExtensionObject("mq").hgQueueGuardsDropAll( + self.project.getProjectPath()) def __hgQueueGuardsList(self): """ Private slot used to list the guards for the current or a named patch. """ - self.vcs.getExtensionObject("mq")\ - .hgQueueGuardsList(self.project.getProjectPath()) + self.vcs.getExtensionObject("mq").hgQueueGuardsList( + self.project.getProjectPath()) def __hgQueueGuardsListAll(self): """ Private slot used to list all guards of all patches. """ - self.vcs.getExtensionObject("mq")\ - .hgQueueGuardsListAll(self.project.getProjectPath()) + self.vcs.getExtensionObject("mq").hgQueueGuardsListAll( + self.project.getProjectPath()) def __hgQueueGuardsSetActive(self): """ Private slot used to set the active guards. """ - self.vcs.getExtensionObject("mq")\ - .hgQueueGuardsSetActive(self.project.getProjectPath()) + self.vcs.getExtensionObject("mq").hgQueueGuardsSetActive( + self.project.getProjectPath()) def __hgQueueGuardsDeactivate(self): """ Private slot used to deactivate all active guards. """ - self.vcs.getExtensionObject("mq")\ - .hgQueueGuardsDeactivate(self.project.getProjectPath()) + self.vcs.getExtensionObject("mq").hgQueueGuardsDeactivate( + self.project.getProjectPath()) def __hgQueueGuardsIdentifyActive(self): """ Private slot used to list all active guards. """ - self.vcs.getExtensionObject("mq")\ - .hgQueueGuardsIdentifyActive(self.project.getProjectPath()) + self.vcs.getExtensionObject("mq").hgQueueGuardsIdentifyActive( + self.project.getProjectPath()) def __hgQueueCreateQueue(self): """ Private slot used to create a new queue. """ - self.vcs.getExtensionObject("mq")\ - .hgQueueCreateRenameQueue(self.project.getProjectPath(), True) + self.vcs.getExtensionObject("mq").hgQueueCreateRenameQueue( + self.project.getProjectPath(), True) def __hgQueueRenameQueue(self): """ Private slot used to rename the active queue. """ - self.vcs.getExtensionObject("mq")\ - .hgQueueCreateRenameQueue(self.project.getProjectPath(), False) + self.vcs.getExtensionObject("mq").hgQueueCreateRenameQueue( + self.project.getProjectPath(), False) def __hgQueueDeleteQueue(self): """ Private slot used to delete the reference to a queue. """ - self.vcs.getExtensionObject("mq")\ - .hgQueueDeletePurgeActivateQueue(self.project.getProjectPath(), - Queues.QUEUE_DELETE) + self.vcs.getExtensionObject("mq").hgQueueDeletePurgeActivateQueue( + self.project.getProjectPath(), Queues.QUEUE_DELETE) def __hgQueuePurgeQueue(self): """ Private slot used to delete the reference to a queue and remove the patch directory. """ - self.vcs.getExtensionObject("mq")\ - .hgQueueDeletePurgeActivateQueue(self.project.getProjectPath(), - Queues.QUEUE_PURGE) + self.vcs.getExtensionObject("mq").hgQueueDeletePurgeActivateQueue( + self.project.getProjectPath(), Queues.QUEUE_PURGE) def __hgQueueActivateQueue(self): """ Private slot used to set the active queue. """ - self.vcs.getExtensionObject("mq")\ - .hgQueueDeletePurgeActivateQueue(self.project.getProjectPath(), - Queues.QUEUE_ACTIVATE) + self.vcs.getExtensionObject("mq").hgQueueDeletePurgeActivateQueue( + self.project.getProjectPath(), Queues.QUEUE_ACTIVATE) def __hgQueueListQueues(self): """ Private slot used to list available queues. """ - self.vcs.getExtensionObject("mq")\ - .hgQueueListQueues(self.project.getProjectPath()) + self.vcs.getExtensionObject("mq").hgQueueListQueues( + self.project.getProjectPath()) def __hgQueueInit(self): """ Private slot to initialize a new queue repository. """ - self.vcs.getExtensionObject("mq")\ - .hgQueueInit(self.project.getProjectPath()) + self.vcs.getExtensionObject("mq").hgQueueInit( + self.project.getProjectPath()) def __hgQueueCommit(self): """ @@ -1108,8 +1103,8 @@ """ Private slot to show the status of the queue repository. """ - self.vcs.getExtensionObject("mq")\ - .hgQueueStatus(self.project.getProjectPath()) + self.vcs.getExtensionObject("mq").hgQueueStatus( + self.project.getProjectPath()) def __hgQueueSummary(self): """
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py Sat Sep 21 22:03:03 2019 +0200 @@ -234,8 +234,9 @@ from .HgQueuesNewPatchDialog import HgQueuesNewPatchDialog dlg = HgQueuesNewPatchDialog(HgQueuesNewPatchDialog.NEW_MODE) if dlg.exec_() == QDialog.Accepted: - name, message, (userData, currentUser, userName), \ - (dateData, currentDate, dateStr) = dlg.getData() + (name, message, + (userData, currentUser, userName), + (dateData, currentDate, dateStr)) = dlg.getData() args = self.vcs.initCommand("qnew") if message != "": @@ -284,8 +285,9 @@ dlg = HgQueuesNewPatchDialog(HgQueuesNewPatchDialog.REFRESH_MODE, currentMessage) if dlg.exec_() == QDialog.Accepted: - name, message, (userData, currentUser, userName), \ - (dateData, currentDate, dateStr) = dlg.getData() + (name, message, + (userData, currentUser, userName), + (dateData, currentDate, dateStr)) = dlg.getData() if message != "" and message != currentMessage: args.append("--message") args.append(message) @@ -455,8 +457,9 @@ if patchnames: currentPatch = self.__getCurrentPatch(repodir) if currentPatch: - from .HgQueuesRenamePatchDialog import \ + from .HgQueuesRenamePatchDialog import ( HgQueuesRenamePatchDialog + ) dlg = HgQueuesRenamePatchDialog(currentPatch, patchnames) if dlg.exec_() == QDialog.Accepted: newName, selectedPatch = dlg.getData() @@ -565,8 +568,8 @@ self.__getPatchesList(repodir, Queues.SERIES_LIST)) if patchnames: from .HgQueuesListGuardsDialog import HgQueuesListGuardsDialog - self.queuesListGuardsDialog = \ - HgQueuesListGuardsDialog(self.vcs, patchnames) + self.queuesListGuardsDialog = HgQueuesListGuardsDialog( + self.vcs, patchnames) self.queuesListGuardsDialog.show() self.queuesListGuardsDialog.start(name) else: @@ -674,8 +677,9 @@ guardsList = self.getGuardsList(repodir) if guardsList: activeGuardsList = self.getGuardsList(repodir, allGuards=False) - from .HgQueuesGuardsSelectionDialog import \ + from .HgQueuesGuardsSelectionDialog import ( HgQueuesGuardsSelectionDialog + ) dlg = HgQueuesGuardsSelectionDialog( guardsList, activeGuards=activeGuardsList, listOnly=False) if dlg.exec_() == QDialog.Accepted: @@ -731,8 +735,9 @@ guardsList = self.getGuardsList(repodir, allGuards=False) if guardsList: - from .HgQueuesGuardsSelectionDialog import \ + from .HgQueuesGuardsSelectionDialog import ( HgQueuesGuardsSelectionDialog + ) dlg = HgQueuesGuardsSelectionDialog(guardsList, listOnly=True) dlg.exec_() @@ -754,8 +759,9 @@ title = self.tr("Create New Queue") else: title = self.tr("Rename Active Queue") - from .HgQueuesQueueManagementDialog import \ + from .HgQueuesQueueManagementDialog import ( HgQueuesQueueManagementDialog + ) dlg = HgQueuesQueueManagementDialog( HgQueuesQueueManagementDialog.NAME_INPUT, title, False, repodir, self.vcs) @@ -797,8 +803,10 @@ title, """<p>{0}</p><p>{1}</p>""".format(errMsg, error)) else: - if self.queuesListQueuesDialog is not None and \ - self.queuesListQueuesDialog.isVisible(): + if ( + self.queuesListQueuesDialog is not None and + self.queuesListQueuesDialog.isVisible() + ): self.queuesListQueuesDialog.refresh() def hgQueueDeletePurgeActivateQueue(self, name, operation): @@ -827,8 +835,9 @@ else: raise ValueError("illegal value for operation") - from .HgQueuesQueueManagementDialog import \ + from .HgQueuesQueueManagementDialog import ( HgQueuesQueueManagementDialog + ) dlg = HgQueuesQueueManagementDialog( HgQueuesQueueManagementDialog.QUEUE_INPUT, title, True, repodir, self.vcs) @@ -871,8 +880,10 @@ title, """<p>{0}</p><p>{1}</p>""".format(errMsg, error)) else: - if self.queuesListQueuesDialog is not None and \ - self.queuesListQueuesDialog.isVisible(): + if ( + self.queuesListQueuesDialog is not None and + self.queuesListQueuesDialog.isVisible() + ): self.queuesListQueuesDialog.refresh() def hgQueueListQueues(self, name): @@ -888,8 +899,9 @@ if os.path.splitdrive(repodir)[1] == os.sep: return - from .HgQueuesQueueManagementDialog import \ + from .HgQueuesQueueManagementDialog import ( HgQueuesQueueManagementDialog + ) self.queuesListQueuesDialog = HgQueuesQueueManagementDialog( HgQueuesQueueManagementDialog.NO_INPUT, self.tr("Available Queues"),
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py Sat Sep 21 22:03:03 2019 +0200 @@ -104,8 +104,8 @@ """ Private slot used to rebase changesets to another branch. """ - shouldReopen = self.vcs.getExtensionObject("rebase")\ - .hgRebase(self.project.getProjectPath()) + shouldReopen = self.vcs.getExtensionObject("rebase").hgRebase( + self.project.getProjectPath()) if shouldReopen: res = E5MessageBox.yesNo( None, @@ -119,8 +119,8 @@ """ Private slot used to continue the last rebase session after repair. """ - shouldReopen = self.vcs.getExtensionObject("rebase")\ - .hgRebaseContinue(self.project.getProjectPath()) + shouldReopen = self.vcs.getExtensionObject("rebase").hgRebaseContinue( + self.project.getProjectPath()) if shouldReopen: res = E5MessageBox.yesNo( None, @@ -134,8 +134,8 @@ """ Private slot used to abort the last rebase session. """ - shouldReopen = self.vcs.getExtensionObject("rebase")\ - .hgRebaseAbort(self.project.getProjectPath()) + shouldReopen = self.vcs.getExtensionObject("rebase").hgRebaseAbort( + self.project.getProjectPath()) if shouldReopen: res = E5MessageBox.yesNo( None,
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py Sat Sep 21 22:03:03 2019 +0200 @@ -12,8 +12,10 @@ from PyQt5.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer from PyQt5.QtGui import QCursor -from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QTreeWidgetItem, \ - QAbstractButton, QMenu, QHeaderView, QApplication, QLineEdit +from PyQt5.QtWidgets import ( + QWidget, QDialogButtonBox, QTreeWidgetItem, QAbstractButton, QMenu, + QHeaderView, QApplication, QLineEdit +) from E5Gui import E5MessageBox @@ -86,8 +88,10 @@ if self.__hgClient.isExecuting(): self.__hgClient.cancel() else: - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -229,8 +233,10 @@ Private slot called when the process finished or the user pressed the button. """ - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: + if ( + self.process is not None and + self.process.state() != QProcess.NotRunning + ): self.process.terminate() QTimer.singleShot(2000, self.process.kill) self.process.waitForFinished(3000) @@ -464,8 +470,8 @@ itm = self.shelveList.selectedItems()[0] if itm is not None: name = itm.text(self.NameColumn) - self.vcs.getExtensionObject("shelve")\ - .hgUnshelve(self.__projectDir, shelveName=name) + self.vcs.getExtensionObject("shelve").hgUnshelve( + self.__projectDir, shelveName=name) self.on_refreshButton_clicked() def __deleteShelves(self): @@ -476,14 +482,14 @@ for itm in self.shelveList.selectedItems(): shelveNames.append(itm.text(self.NameColumn)) if shelveNames: - self.vcs.getExtensionObject("shelve")\ - .hgDeleteShelves(self.__projectDir, shelveNames=shelveNames) + self.vcs.getExtensionObject("shelve").hgDeleteShelves( + self.__projectDir, shelveNames=shelveNames) self.on_refreshButton_clicked() def __cleanupShelves(self): """ Private slot to delete all shelves. """ - self.vcs.getExtensionObject("shelve")\ - .hgCleanupShelves(self.__projectDir) + self.vcs.getExtensionObject("shelve").hgCleanupShelves( + self.__projectDir) self.on_refreshButton_clicked()
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py Sat Sep 21 22:03:03 2019 +0200 @@ -111,6 +111,5 @@ except AttributeError: name = itm.dirName() names.append(name) - shouldReopen = self.vcs.getExtensionObject("shelve")\ - .hgShelve(names) + shouldReopen = self.vcs.getExtensionObject("shelve").hgShelve(names) self.__reopenProject(shouldReopen, self.tr("Shelve"))
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py Sat Sep 21 22:03:03 2019 +0200 @@ -183,39 +183,41 @@ """ Private slot used to shelve all current changes. """ - shouldReopen = self.vcs.getExtensionObject("shelve")\ - .hgShelve(self.project.getProjectPath()) + shouldReopen = self.vcs.getExtensionObject("shelve").hgShelve( + self.project.getProjectPath()) self.__reopenProject(shouldReopen, self.tr("Shelve")) def __hgShelveBrowser(self): """ Private slot to show the shelve browser dialog. """ - self.vcs.getExtensionObject("shelve")\ - .hgShelveBrowser(self.project.getProjectPath()) + self.vcs.getExtensionObject("shelve").hgShelveBrowser( + self.project.getProjectPath()) def __hgUnshelve(self): """ Private slot used to restore a shelved change. """ - shouldReopen = self.vcs.getExtensionObject("shelve")\ - .hgUnshelve(self.project.getProjectPath()) + shouldReopen = self.vcs.getExtensionObject("shelve").hgUnshelve( + self.project.getProjectPath()) self.__reopenProject(shouldReopen, self.tr("Unshelve")) def __hgUnshelveAbort(self): """ Private slot used to abort an ongoing restore operation. """ - shouldReopen = self.vcs.getExtensionObject("shelve")\ - .hgUnshelveAbort(self.project.getProjectPath()) + shouldReopen = self.vcs.getExtensionObject("shelve").hgUnshelveAbort( + self.project.getProjectPath()) self.__reopenProject(shouldReopen, self.tr("Abort Unshelve")) def __hgUnshelveContinue(self): """ Private slot used to continue an ongoing restore operation. """ - shouldReopen = self.vcs.getExtensionObject("shelve")\ - .hgUnshelveContinue(self.project.getProjectPath()) + shouldReopen = ( + self.vcs.getExtensionObject("shelve").hgUnshelveContinue( + self.project.getProjectPath()) + ) self.__reopenProject(shouldReopen, self.tr("Continue Unshelve")) def __hgDeleteShelves(self):
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py Sat Sep 21 22:03:03 2019 +0200 @@ -255,8 +255,9 @@ else: return - from UI.DeleteFilesConfirmationDialog import \ + from UI.DeleteFilesConfirmationDialog import ( DeleteFilesConfirmationDialog + ) dlg = DeleteFilesConfirmationDialog( None, self.tr("Delete shelves"),
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py Sat Sep 21 22:03:03 2019 +0200 @@ -78,8 +78,8 @@ """ Private slot used to strip revisions from a repository. """ - shouldReopen = self.vcs.getExtensionObject("strip")\ - .hgStrip(self.project.getProjectPath()) + shouldReopen = self.vcs.getExtensionObject("strip").hgStrip( + self.project.getProjectPath()) if shouldReopen: res = E5MessageBox.yesNo( None,
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/hg.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/hg.py Sat Sep 21 22:03:03 2019 +0200 @@ -11,8 +11,9 @@ import os import shutil -from PyQt5.QtCore import QProcess, pyqtSignal, QFileInfo, QFileSystemWatcher, \ - QCoreApplication +from PyQt5.QtCore import ( + QProcess, pyqtSignal, QFileInfo, QFileSystemWatcher, QCoreApplication +) from PyQt5.QtWidgets import QApplication, QDialog, QInputDialog from E5Gui.E5Application import e5App @@ -462,14 +463,16 @@ if os.path.isdir(nam): project = e5App().getObject("Project") if nam == project.getProjectPath(): - ok &= \ + ok &= ( project.checkAllScriptsDirty( - reportSyntaxErrors=True) and \ + reportSyntaxErrors=True) and project.checkDirty() + ) continue elif os.path.isfile(nam): - editor = \ + editor = ( e5App().getObject("ViewManager").getOpenEditor(nam) + ) if editor: ok &= editor.checkDirty() if not ok: @@ -499,8 +502,8 @@ return if self.__commitDialog is not None: - msg, amend, commitSubrepositories, author, dateTime = \ - self.__commitDialog.getCommitData() + (msg, amend, commitSubrepositories, author, + dateTime) = self.__commitDialog.getCommitData() self.__commitDialog.deleteLater() self.__commitDialog = None if amend and not msg: @@ -995,8 +998,9 @@ project = e5App().getObject("Project") names = [project.getRelativePath(nam) for nam in names] if names[0]: - from UI.DeleteFilesConfirmationDialog import \ + from UI.DeleteFilesConfirmationDialog import ( DeleteFilesConfirmationDialog + ) dlg = DeleteFilesConfirmationDialog( self.parent(), self.tr("Revert changes"), @@ -1098,8 +1102,9 @@ project = e5App().getObject("Project") names = [project.getRelativePath(nam) for nam in names] if names[0]: - from UI.DeleteFilesConfirmationDialog import \ + from UI.DeleteFilesConfirmationDialog import ( DeleteFilesConfirmationDialog + ) dlg = DeleteFilesConfirmationDialog( self.parent(), self.tr("Re-Merge"), @@ -1425,8 +1430,8 @@ index = 0 for line in output.splitlines(): index += 1 - changeset, tags, author, date, branches, bookmarks = \ - line.split("@@@") + (changeset, tags, author, date, branches, + bookmarks) = line.split("@@@") cdate, ctime = date.split()[:2] info = [] info.append(QCoreApplication.translate( @@ -1553,8 +1558,10 @@ if res: dia.exec_() res = dia.normalExit() - if res and \ - target.startswith(project.getProjectPath()): + if ( + res and + target.startswith(project.getProjectPath()) + ): if os.path.isdir(name): project.copyDirectory(name, target) else: @@ -1930,10 +1937,12 @@ or delete @rtype bool """ - if self.getPlugin().getPreferences("PreferUnbundle") and \ - self.bundleFile and \ - os.path.exists(self.bundleFile) and \ - revisions is None: + if ( + self.getPlugin().getPreferences("PreferUnbundle") and + self.bundleFile and + os.path.exists(self.bundleFile) and + revisions is None + ): command = "unbundle" title = self.tr('Apply changegroups') else: @@ -1963,8 +1972,10 @@ if res: dia.exec_() res = dia.hasAddOrDelete() - if self.bundleFile and \ - os.path.exists(self.bundleFile): + if ( + self.bundleFile and + os.path.exists(self.bundleFile) + ): os.remove(self.bundleFile) self.bundleFile = None self.checkVCSStatus() @@ -2046,8 +2057,8 @@ index = 0 for line in output.splitlines(): index += 1 - changeset, tags, author, date, branches, parents, bookmarks = \ - line.split("@@@") + (changeset, tags, author, date, branches, parents, + bookmarks) = line.split("@@@") cdate, ctime = date.split()[:2] info.append("""<p><table>""") if mode == "heads": @@ -2320,8 +2331,10 @@ if defaultPushUrl: cfg.write("default-push = {0}\n".format( defaultPushUrl)) - if withLargefiles and \ - (lfMinSize, lfPattern) != (None, None): + if ( + withLargefiles and + (lfMinSize, lfPattern) != (None, None) + ): cfg.write("\n[largefiles]\n") if lfMinSize is not None: cfg.write("minsize = {0}\n".format(lfMinSize)) @@ -2620,8 +2633,8 @@ if self.logBrowserIncoming is None: from .HgLogBrowserDialog import HgLogBrowserDialog - self.logBrowserIncoming = \ - HgLogBrowserDialog(self, mode="incoming") + self.logBrowserIncoming = HgLogBrowserDialog( + self, mode="incoming") self.logBrowserIncoming.show() self.logBrowserIncoming.raise_() self.logBrowserIncoming.start(name, bundle=file) @@ -2875,8 +2888,8 @@ from .HgImportDialog import HgImportDialog dlg = HgImportDialog() if dlg.exec_() == QDialog.Accepted: - patchFile, noCommit, message, date, user, stripCount, force = \ - dlg.getParameters() + (patchFile, noCommit, message, date, user, stripCount, + force) = dlg.getParameters() args = self.initCommand("import") args.append("--verbose") @@ -2929,8 +2942,8 @@ dlg = HgExportDialog(self.hgGetBookmarksList(repodir), self.version >= (4, 7, 0)) if dlg.exec_() == QDialog.Accepted: - filePattern, revisions, bookmark, switchParent, allText, noDates, \ - git = dlg.getParameters() + (filePattern, revisions, bookmark, switchParent, allText, + noDates, git) = dlg.getParameters() args = self.initCommand("export") args.append("--output") @@ -3028,9 +3041,10 @@ res = False dlg = HgGraftDialog(self, revs) if dlg.exec_() == QDialog.Accepted: - revs, (userData, currentUser, userName), \ - (dateData, currentDate, dateStr), log, dryrun, \ - noCommit = dlg.getData() + (revs, + (userData, currentUser, userName), + (dateData, currentDate, dateStr), + log, dryrun, noCommit) = dlg.getData() args = self.initCommand("graft") args.append("--verbose") @@ -3302,8 +3316,9 @@ .format(str(err))) return - from .HgRemoveSubrepositoriesDialog import \ + from .HgRemoveSubrepositoriesDialog import ( HgRemoveSubrepositoriesDialog + ) dlg = HgRemoveSubrepositoriesDialog(subrepositories) if dlg.exec_() == QDialog.Accepted: subrepositories, removedSubrepos, deleteSubrepos = dlg.getData() @@ -3359,11 +3374,15 @@ self.__defaultPushConfigured = False if output: for line in output.splitlines(): - if line.startswith("paths.default=") and \ - not line.strip().endswith("="): + if ( + line.startswith("paths.default=") and + not line.strip().endswith("=") + ): self.__defaultConfigured = True - if line.startswith("paths.default-push=") and \ - not line.strip().endswith("="): + if ( + line.startswith("paths.default-push=") and + not line.strip().endswith("=") + ): self.__defaultPushConfigured = True def canCommitMerge(self, name): @@ -3495,8 +3514,9 @@ if output: for line in output.splitlines(): - extensionName = \ + extensionName = ( line.split("=", 1)[0].strip().split(".")[-1].strip() + ) self.__activeExtensions.append(extensionName) if self.version < (4, 8, 0) and "closehead" in self.__activeExtensions: self.__activeExtensions.remove["closehead"]
--- a/eric6/eric6.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/eric6.py Sat Sep 21 22:03:03 2019 +0200 @@ -112,8 +112,10 @@ client = E5SingleApplicationClient() res = client.connect() if res > 0: - if "--no-splash" in sys.argv and \ - sys.argv.index("--no-splash") < ddindex: + if ( + "--no-splash" in sys.argv and + sys.argv.index("--no-splash") < ddindex + ): sys.argv.remove("--no-splash") ddindex -= 1 if "--no-open" in sys.argv and sys.argv.index("--no-open") < ddindex: @@ -121,28 +123,36 @@ ddindex -= 1 if "--no-crash" in sys.argv and sys.argv.index("--no-crash") < ddindex: sys.argv.remove("--no-crash") - if "--disable-crash" in sys.argv and \ - sys.argv.index("--disable-crash") < ddindex: + if ( + "--disable-crash" in sys.argv and + sys.argv.index("--disable-crash") < ddindex + ): sys.argv.remove("--disable-crash") ddindex -= 1 if "--debug" in sys.argv and sys.argv.index("--debug") < ddindex: sys.argv.remove("--debug") ddindex -= 1 for arg in sys.argv: - if arg.startswith("--config=") and \ - sys.argv.index(arg) < ddindex: + if ( + arg.startswith("--config=") and + sys.argv.index(arg) < ddindex + ): sys.argv.remove(arg) ddindex -= 1 break for arg in sys.argv: - if arg.startswith("--plugin=") and \ - sys.argv.index(arg) < ddindex: + if ( + arg.startswith("--plugin=") and + sys.argv.index(arg) < ddindex + ): sys.argv.remove(arg) ddindex -= 1 break for arg in sys.argv[:]: - if arg.startswith("--disable-plugin=") and \ - sys.argv.index(arg) < ddindex: + if ( + arg.startswith("--disable-plugin=") and + sys.argv.index(arg) < ddindex + ): sys.argv.remove(arg) ddindex -= 1 @@ -169,11 +179,12 @@ separator = '-' * 80 logFile = os.path.join(Globals.getConfigDir(), "eric6_error.log") - notice = \ - """An unhandled exception occurred. Please report the problem\n"""\ - """using the error reporting dialog or via email to <{0}>.\n"""\ + notice = ( + """An unhandled exception occurred. Please report the problem\n""" + """using the error reporting dialog or via email to <{0}>.\n""" """A log has been written to "{1}".\n\nError information:\n""".format( BugAddress, logFile) + ) timeString = time.strftime("%Y-%m-%d, %H:%M:%S") versionInfo = "\n{0}\n{1}".format( @@ -209,10 +220,12 @@ else: warning = notice + msg + versionInfo # Escape &<> otherwise it's not visible in the error dialog - warning = warning\ - .replace("&", "&")\ - .replace(">", ">")\ + warning = ( + warning + .replace("&", "&") + .replace(">", ">") .replace("<", "<") + ) qWarning(warning) @@ -331,14 +344,18 @@ sys.argv.remove("--no-crash") ddindex -= 1 nocrash = True - if "--disable-crash" in sys.argv and \ - sys.argv.index("--disable-crash") < ddindex: + if ( + "--disable-crash" in sys.argv and + sys.argv.index("--disable-crash") < ddindex + ): sys.argv.remove("--disable-crash") ddindex -= 1 disablecrash = True for arg in sys.argv[:]: - if arg.startswith("--disable-plugin=") and \ - sys.argv.index(arg) < ddindex: + if ( + arg.startswith("--disable-plugin=") and + sys.argv.index(arg) < ddindex + ): # extract the plug-in name pluginName = arg.replace("--disable-plugin=", "") sys.argv.remove(arg)
--- a/eric6/eric6_api.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/eric6_api.py Sat Sep 21 22:03:03 2019 +0200 @@ -166,8 +166,7 @@ includePrivate = True elif k in ["-l", "--language"]: if v not in progLanguages: - if v not in \ - DocumentationTools.supportedExtensionsDictForApis: + if v not in DocumentationTools.supportedExtensionsDictForApis: sys.stderr.write( "Wrong language given: {0}. Aborting\n".format(v)) sys.exit(1) @@ -196,8 +195,9 @@ apis = [] basesDict = {} - supportedExtensions = \ + supportedExtensions = ( DocumentationTools.supportedExtensionsDictForApis[progLanguage] + ) supportedExtensions.extend(extensions) if "%L" in outputFileName: outputFile = outputFileName.replace("%L", progLanguage) @@ -251,8 +251,10 @@ # assume package inpackage = True else: - if Utilities.isWindowsPlatform() and \ - glob.has_magic(filename): + if ( + Utilities.isWindowsPlatform() and + glob.has_magic(filename) + ): files = glob.glob(filename) else: files = [filename]
--- a/eric6/eric6_browser.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/eric6_browser.py Sat Sep 21 22:03:03 2019 +0200 @@ -74,8 +74,9 @@ from Toolbox import Startup -from WebBrowser.WebBrowserSingleApplication import \ +from WebBrowser.WebBrowserSingleApplication import ( WebBrowserSingleApplicationClient +) def createMainWidget(argv):
--- a/eric6/eric6_doc.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/eric6_doc.py Sat Sep 21 22:03:03 2019 +0200 @@ -257,10 +257,13 @@ if not args: usage() - if qtHelpCreation and \ - (qtHelpNamespace == "" or - qtHelpFolder == "" or '/' in qtHelpFolder or - qtHelpTitle == ""): + if ( + qtHelpCreation and + (qtHelpNamespace == "" or + qtHelpFolder == "" or + '/' in qtHelpFolder or + qtHelpTitle == "") + ): usage() basename = "" @@ -388,8 +391,10 @@ if qtHelpCreation: qtHelpGenerator.remember(file, moduleDocument, basename) - if (noempty or file.endswith('__init__.py')) \ - and moduleDocument.isEmpty(): + if ( + (noempty or file.endswith('__init__.py')) and + moduleDocument.isEmpty() + ): continue # generate output
--- a/eric6/eric6_post_install.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/eric6_post_install.py Sat Sep 21 22:03:03 2019 +0200 @@ -23,8 +23,10 @@ """ Create Desktop and Start Menu links. """ - regPath = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer" + \ - "\\User Shell Folders" + regPath = ( + "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer" + + "\\User Shell Folders" + ) # 1. create desktop shortcuts regName = "Desktop"
--- a/eric6/eric6_qregexp.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/eric6_qregexp.py Sat Sep 21 22:03:03 2019 +0200 @@ -45,8 +45,9 @@ @param argv list of commandline parameters (list of strings) @return reference to the main widget (QWidget) """ - from Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog import \ + from Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog import ( QRegExpWizardWindow + ) return QRegExpWizardWindow()
--- a/eric6/eric6_qregularexpression.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/eric6_qregularexpression.py Sat Sep 21 22:03:03 2019 +0200 @@ -45,9 +45,10 @@ @param argv list of commandline parameters (list of strings) @return reference to the main widget (QWidget) """ - from Plugins.WizardPlugins.QRegularExpressionWizard\ - .QRegularExpressionWizardDialog import QRegularExpressionWizardWindow - return QRegularExpressionWizardWindow() + from Plugins.WizardPlugins.QRegularExpressionWizard import ( + QRegularExpressionWizardDialog + ) + return QRegularExpressionWizardDialog.QRegularExpressionWizardWindow() def main():
--- a/eric6/eric6_re.py Sat Sep 21 20:30:56 2019 +0200 +++ b/eric6/eric6_re.py Sat Sep 21 22:03:03 2019 +0200 @@ -45,8 +45,9 @@ @param argv list of commandline parameters (list of strings) @return reference to the main widget (QWidget) """ - from Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog import \ + from Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog import ( PyRegExpWizardWindow + ) return PyRegExpWizardWindow()
--- a/scripts/create_windows_links.py Sat Sep 21 20:30:56 2019 +0200 +++ b/scripts/create_windows_links.py Sat Sep 21 22:03:03 2019 +0200 @@ -22,8 +22,10 @@ @param argv list of command line arguments @type list of str """ - regPath = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer" + \ - "\\User Shell Folders" + regPath = ( + "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer" + + "\\User Shell Folders" + ) # 1. create desktop shortcuts regName = "Desktop"
--- a/scripts/install-debugclients.py Sat Sep 21 20:30:56 2019 +0200 +++ b/scripts/install-debugclients.py Sat Sep 21 22:03:03 2019 +0200 @@ -252,9 +252,11 @@ global progName, modDir, doCleanup, doCompile, distDir global sourceDir - if sys.version_info < (2, 7, 0) or \ - (sys.version_info >= (3, 0, 0) and sys.version_info < (3, 5, 0)) \ - or sys.version_info > (3, 99, 99): + if ( + sys.version_info < (2, 7, 0) or + (sys.version_info >= (3, 0, 0) and sys.version_info < (3, 5, 0)) or + sys.version_info >= (4, 0, 0) + ): print('Sorry, the eric6 debugger requires Python 2.7 or' 'Python 3.5 or better for running.') exit(5)
--- a/scripts/install.py Sat Sep 21 20:30:56 2019 +0200 +++ b/scripts/install.py Sat Sep 21 22:03:03 2019 +0200 @@ -194,8 +194,10 @@ else: # install them in the user's bin directory platBinDir = os.path.expanduser("~/bin") - if platBinDir != "/usr/local/bin" and \ - os.access("/usr/local/bin", os.W_OK): + if ( + platBinDir != "/usr/local/bin" and + os.access("/usr/local/bin", os.W_OK) + ): platBinDirOld = "/usr/local/bin" modDir = distutils.sysconfig.get_python_lib(True) @@ -276,9 +278,11 @@ text = f.read() f.close() - text = text.replace("@MARKER@", "")\ - .replace("@VERSION@", Version.split(None, 1)[0])\ + text = ( + text.replace("@MARKER@", "") + .replace("@VERSION@", Version.split(None, 1)[0]) .replace("@DATE@", time.strftime("%Y-%m-%d")) + ) f = open(dst, "w", encoding="utf-8") f.write(text) @@ -319,17 +323,19 @@ if sys.platform.startswith(("win", "cygwin")): wname = wfile + ".cmd" if isGuiScript: - wrapper = \ - '''@echo off\n''' \ - '''start "" "{2}\\pythonw.exe"''' \ - ''' "{0}\\{1}.pyw"''' \ + wrapper = ( + '''@echo off\n''' + '''start "" "{2}\\pythonw.exe"''' + ''' "{0}\\{1}.pyw"''' ''' %1 %2 %3 %4 %5 %6 %7 %8 %9\n'''.format( pydir, wfile, sys.exec_prefix) + ) else: - wrapper = \ - '''@"{0}\\python" "{1}\\{2}.py"''' \ + wrapper = ( + '''@"{0}\\python" "{1}\\{2}.py"''' ''' %1 %2 %3 %4 %5 %6 %7 %8 %9\n'''.format( sys.exec_prefix, pydir, wfile) + ) # Mac OS X elif sys.platform == "darwin": @@ -639,8 +645,10 @@ # links were not created by install.py return - regPath = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer" + \ - "\\User Shell Folders" + regPath = ( + "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer" + + "\\User Shell Folders" + ) if doCleanDesktopLinks or forceCleanDesktopLinks: # 1. cleanup desktop links @@ -1007,8 +1015,10 @@ ) return - regPath = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer" + \ - "\\User Shell Folders" + regPath = ( + "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer" + + "\\User Shell Folders" + ) # 1. create desktop shortcuts regName = "Desktop" @@ -1459,8 +1469,11 @@ major = int(major) minor = int(minor) pat = int(pat) - if major < 4 or (major == 4 and minor < 14) or \ - (major == 4 and minor == 14 and pat < 2): + if ( + major < 4 or + (major == 4 and minor < 14) or + (major == 4 and minor == 14 and pat < 2) + ): print('Sorry, you must have sip 4.14.2 or higher or' ' a recent snapshot release.') exit(3) @@ -1516,8 +1529,10 @@ ' a recent snapshot release.') exit(5) # check for blacklisted versions - for vers in BlackLists["QScintilla2"] + \ - PlatformBlackLists["QScintilla2"]: + for vers in ( + BlackLists["QScintilla2"] + + PlatformBlackLists["QScintilla2"] + ): if vers == scintillaVersion: print( 'Sorry, QScintilla2 version {0} is not compatible with' @@ -1574,8 +1589,10 @@ f = open(fileName + ".orig", "r", encoding="utf-8") text = f.read() f.close() - text = text.replace("@@REVISION@@", hgOut)\ + text = ( + text.replace("@@REVISION@@", hgOut) .replace("@@VERSION@@", "rev_" + hgOut) + ) copyToFile(fileName, text) else: shutil.copy(fileName + ".orig", fileName)
--- a/scripts/uninstall.py Sat Sep 21 20:30:56 2019 +0200 +++ b/scripts/uninstall.py Sat Sep 21 22:03:03 2019 +0200 @@ -211,8 +211,10 @@ # links were not created by install.py return - regPath = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer" + \ - "\\User Shell Folders" + regPath = ( + "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer" + + "\\User Shell Folders" + ) # 1. cleanup desktop links regName = "Desktop"
--- a/setup.py Sat Sep 21 20:30:56 2019 +0200 +++ b/setup.py Sat Sep 21 22:03:03 2019 +0200 @@ -56,8 +56,10 @@ filesList = [] for dirpath, _dirnames, filenames in os.walk(package): for fname in filenames: - if not fname.startswith('.') and \ - os.path.splitext(fname)[1] in extensions: + if ( + not fname.startswith('.') and + os.path.splitext(fname)[1] in extensions + ): filesList.append( os.path.relpath(os.path.join(dirpath, fname), package)) return filesList @@ -146,8 +148,10 @@ f = open(fileName + ".orig", "r", encoding="utf-8") text = f.read() f.close() - text = text.replace("@@REVISION@@", hgOut)\ + text = ( + text.replace("@@REVISION@@", hgOut) .replace("@@VERSION@@", version) + ) f = open(fileName, "w") f.write(text) f.close() @@ -172,8 +176,10 @@ f = open(fileName + ".orig", "r", encoding="utf-8") text = f.read() f.close() - text = text.replace("@VERSION@", version)\ + text = ( + text.replace("@VERSION@", version) .replace("@DATE@", datetime.date.today().isoformat()) + ) f = open(fileName, "w") f.write(text) f.close()
