eric: comparison src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py

-:e9e7eca7efee
+:bf71ee032bb4
 import os
 from PyQt6.QtCore import QTimer, QProcess, Qt, pyqtSlot
 from PyQt6.QtWidgets import (
-QHeaderView, QLineEdit, QDialog, QDialogButtonBox, QTreeWidgetItem
+QHeaderView,
+QLineEdit,
+QDialog,
+QDialogButtonBox,
+QTreeWidgetItem,
 )
 from EricWidgets import EricMessageBox
 from .Ui_SvnBlameDialog import Ui_SvnBlameDialog
 class SvnBlameDialog(QDialog, Ui_SvnBlameDialog):
 """
 Class implementing a dialog to show the output of the svn blame command.
 """
 def __init__(self, vcs, parent=None):
 """
 Constructor
 @param vcs reference to the vcs object
 @param parent parent widget (QWidget)
 """
 super().__init__(parent)
 self.setupUi(self)
 self.setWindowFlags(Qt.WindowType.Window)
-self.buttonBox.button(
+self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(False)
-QDialogButtonBox.StandardButton.Close).setEnabled(False)
+self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setDefault(True)
-self.buttonBox.button(
-QDialogButtonBox.StandardButton.Cancel).setDefault(True)
 self.vcs = vcs
 self.blameList.headerItem().setText(self.blameList.columnCount(), "")
 font = Preferences.getEditorOtherFonts("MonospacedFont")
 self.blameList.setFont(font)
 self.__ioEncoding = Preferences.getSystem("IOEncoding")
 self.process = QProcess()
 self.process.finished.connect(self.__procFinished)
 self.process.readyReadStandardOutput.connect(self.__readStdout)
 self.process.readyReadStandardError.connect(self.__readStderr)
 def closeEvent(self, e):
 """
 Protected slot implementing a close event handler.
 @param e close event (QCloseEvent)
 """
 if (
-self.process is not None and
+self.process is not None
-self.process.state() != QProcess.ProcessState.NotRunning
+and self.process.state() != QProcess.ProcessState.NotRunning
 ):
 self.process.terminate()
 QTimer.singleShot(2000, self.process.kill)
 self.process.waitForFinished(3000)
 e.accept()
 def start(self, fn):
 """
 Public slot to start the svn blame command.
 @param fn filename to show the blame for (string)
 """
 self.blameList.clear()
 self.errorGroup.hide()
 self.intercept = False
 self.activateWindow()
 self.lineno = 1
 dname, fname = self.vcs.splitPath(fn)
 self.process.kill()
 args = []
-args.append('blame')
+args.append("blame")
-self.vcs.addArguments(args, self.vcs.options['global'])
+self.vcs.addArguments(args, self.vcs.options["global"])
 args.append(fname)
 self.process.setWorkingDirectory(dname)
-self.process.start('svn', args)
+self.process.start("svn", args)
 procStarted = self.process.waitForStarted(5000)
 if not procStarted:
 self.inputGroup.setEnabled(False)
 self.inputGroup.hide()
 EricMessageBox.critical(
 self,
-self.tr('Process Generation Error'),
+self.tr("Process Generation Error"),
 self.tr(
-'The process {0} could not be started. '
+"The process {0} could not be started. "
-'Ensure, that it is in the search path.'
+"Ensure, that it is in the search path."
-).format('svn'))
+).format("svn"),
+)
 else:
 self.inputGroup.setEnabled(True)
 self.inputGroup.show()
 def __finish(self):
 """
 Private slot called when the process finished or the user pressed the
 button.
 """
 if (
-self.process is not None and
+self.process is not None
-self.process.state() != QProcess.ProcessState.NotRunning
+and self.process.state() != QProcess.ProcessState.NotRunning
 ):
 self.process.terminate()
 QTimer.singleShot(2000, self.process.kill)
 self.process.waitForFinished(3000)
-self.buttonBox.button(
+self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(True)
-QDialogButtonBox.StandardButton.Close).setEnabled(True)
+self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setEnabled(False)
-self.buttonBox.button(
+self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setDefault(True)
-QDialogButtonBox.StandardButton.Cancel).setEnabled(False)
+self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setFocus(
-self.buttonBox.button(
+Qt.FocusReason.OtherFocusReason
-QDialogButtonBox.StandardButton.Close).setDefault(True)
+)
-self.buttonBox.button(
-QDialogButtonBox.StandardButton.Close).setFocus(
-Qt.FocusReason.OtherFocusReason)
 self.inputGroup.setEnabled(False)
 self.inputGroup.hide()
 self.__resizeColumns()
 def on_buttonBox_clicked(self, button):
 """
 Private slot called by a button of the button box clicked.
 @param button button that was clicked (QAbstractButton)
 """
-if button == self.buttonBox.button(
+if button == self.buttonBox.button(QDialogButtonBox.StandardButton.Close):
-QDialogButtonBox.StandardButton.Close
-):
 self.close()
-elif button == self.buttonBox.button(
+elif button == self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel):
-QDialogButtonBox.StandardButton.Cancel
-):
 self.__finish()
 def __procFinished(self, exitCode, exitStatus):
 """
 Private slot connected to the finished signal.
 @param exitCode exit code of the process (integer)
 @param exitStatus exit status of the process (QProcess.ExitStatus)
 """
 self.__finish()
 def __resizeColumns(self):
 """
 Private method to resize the list columns.
 """
-self.blameList.header().resizeSections(
+self.blameList.header().resizeSections(QHeaderView.ResizeMode.ResizeToContents)
-QHeaderView.ResizeMode.ResizeToContents)
 def __generateItem(self, revision, author, text):
 """
 Private method to generate a blame item in the blame list.
 @param revision revision string (string)
 @param author author of the change (string)
 @param text line of text from the annotated file (string)
 """
 itm = QTreeWidgetItem(
-self.blameList,
+self.blameList, [revision, author, "{0:d}".format(self.lineno), text]
-[revision, author, "{0:d}".format(self.lineno), text])
+)
 self.lineno += 1
 itm.setTextAlignment(0, Qt.AlignmentFlag.AlignRight)
 itm.setTextAlignment(2, Qt.AlignmentFlag.AlignRight)
 def __readStdout(self):
 """
 Private slot to handle the readyReadStdout signal.
 It reads the output of the process, formats it and inserts it into
 the contents pane.
 """
 self.process.setReadChannel(QProcess.ProcessChannel.StandardOutput)
 while self.process.canReadLine():
-s = str(
+s = str(self.process.readLine(), self.__ioEncoding, "replace").strip()
-self.process.readLine(), self.__ioEncoding, 'replace').strip()
 rev, s = s.split(None, 1)
 try:
-author, text = s.split(' ', 1)
+author, text = s.split(" ", 1)
 except ValueError:
 author = s.strip()
 text = ""
 self.__generateItem(rev, author, text)
 def __readStderr(self):
 """
 Private slot to handle the readyReadStderr signal.
 It reads the error output of the process and inserts it into the
 error pane.
 """
 if self.process is not None:
 self.errorGroup.show()
-s = str(self.process.readAllStandardError(),
+s = str(
-Preferences.getSystem("IOEncoding"),
+self.process.readAllStandardError(),
-'replace')
+Preferences.getSystem("IOEncoding"),
+"replace",
+)
 self.errors.insertPlainText(s)
 self.errors.ensureCursorVisible()
 def on_passwordCheckBox_toggled(self, isOn):
 """
 Private slot to handle the password checkbox toggled.
 @param isOn flag indicating the status of the check box (boolean)
 """
 if isOn:
 self.input.setEchoMode(QLineEdit.EchoMode.Password)
 else:
 self.input.setEchoMode(QLineEdit.EchoMode.Normal)
 @pyqtSlot()
 def on_sendButton_clicked(self):
 """
 Private slot to send the input to the subversion process.
 """
 inputTxt = self.input.text()
 inputTxt += os.linesep
 if self.passwordCheckBox.isChecked():
 self.errors.insertPlainText(os.linesep)
 self.errors.ensureCursorVisible()
 else:
 self.errors.insertPlainText(inputTxt)
 self.errors.ensureCursorVisible()
 self.process.write(strToQByteArray(inputTxt))
 self.passwordCheckBox.setChecked(False)
 self.input.clear()
 def on_input_returnPressed(self):
 """
 Private slot to handle the press of the return key in the input field.
 """
 self.intercept = True
 self.on_sendButton_clicked()
 def keyPressEvent(self, evt):
 """
 Protected slot to handle a key press event.
 @param evt the key press event (QKeyEvent)
 """
 if self.intercept:
 self.intercept = False
 evt.accept()

Mercurial Repositories > eric / file comparison

comparison: src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py

src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py