Mercurial Repositories > eric / file diff

diff -r 27f636beebad -r 2c730d5fd177 eric6/CondaInterface/CondaExecDialog.py
--- a/eric6/CondaInterface/CondaExecDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/CondaInterface/CondaExecDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -36,8 +36,10 @@
         super(CondaExecDialog, self).__init__(parent)
         self.setupUi(self)
         
-        self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
-        self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close).setEnabled(False)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Cancel).setDefault(True)
         
         self.__condaCommand = command
         
@@ -54,9 +56,13 @@
         @param button button that was clicked
         @type QAbstractButton
         """
-        if button == self.buttonBox.button(QDialogButtonBox.Close):
+        if button == self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close
+        ):
             self.accept()
-        elif button == self.buttonBox.button(QDialogButtonBox.Cancel):
+        elif button == self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Cancel
+        ):
             self.__finish(1, 0)
     
     def start(self, arguments):
@@ -117,14 +123,17 @@
         @type bool
         """
         if (self.__process is not None and
-           self.__process.state() != QProcess.NotRunning):
+           self.__process.state() != QProcess.ProcessState.NotRunning):
             self.__process.terminate()
             QTimer.singleShot(2000, self.__process.kill)
             self.__process.waitForFinished(3000)
         
-        self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True)
-        self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False)
-        self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close).setEnabled(True)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Cancel).setEnabled(False)
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Close).setDefault(True)
         
         self.progressLabel.hide()
         self.progressBar.hide()
@@ -258,7 +267,7 @@
         It reads the error output of the process and inserts it into the
         error pane.
         """
-        self.__process.setReadChannel(QProcess.StandardError)
+        self.__process.setReadChannel(QProcess.ProcessChannel.StandardError)
         
         while self.__process.canReadLine():
             stderr = str(self.__process.readLine(),