cx_freeze Packager: comparison CxFreeze/CxfreezeExecDialog.py

-:0f3a641c5da5
+:7880b294d1d1
 import shutil
 import errno
 import fnmatch
 import os.path
-from PyQt5.QtCore import pyqtSlot, QProcess, QTimer, QThread, pyqtSignal
+from PyQt6.QtCore import pyqtSlot, QProcess, QTimer, QThread, pyqtSignal
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton
-from E5Gui import E5MessageBox
+from EricWidgets import EricMessageBox
 from .Ui_CxfreezeExecDialog import Ui_CxfreezeExecDialog
 import Preferences
 @param parent parent widget of this dialog (QWidget)
 """
 super().__init__(parent)
 self.setupUi(self)
-self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
+self.buttonBox.button(
-self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
+QDialogButtonBox.StandardButton.Close).setEnabled(False)
+self.buttonBox.button(
+QDialogButtonBox.StandardButton.Cancel).setDefault(True)
 self.process = None
 self.copyProcess = None
 self.cmdname = cmdname
 def start(self, args, parms, ppath, mainscript):
 """
 Public slot to start the packager command.
-@param args commandline arguments for packager program (list of
+@param args commandline arguments for packager program
-strings)
+@type list of str
-@param parms parameters got from the config dialog (dict)
+@param parms parameters got from the config dialog
-@param ppath project path (string)
+@type dict
+@param ppath project path
+@type str
 @param mainscript main script name to be processed by by the packager
-(string)
+@type str
 @return flag indicating the successful start of the process
+@rtype bool
 """
 self.errorGroup.hide()
 script = os.path.join(ppath, mainscript)
 dname = os.path.dirname(script)
 script = os.path.basename(script)
 program = args.pop(0)
 self.process.start(program, args)
 procStarted = self.process.waitForStarted()
 if not procStarted:
-E5MessageBox.critical(
+EricMessageBox.critical(
 self,
 self.tr('Process Generation Error'),
 self.tr(
 'The process {0} could not be started. '
 'Ensure, that it is in the search path.'
 @pyqtSlot(QAbstractButton)
 def on_buttonBox_clicked(self, button):
 """
 Private slot called by a button of the button box clicked.
-@param button button that was clicked (QAbstractButton)
+@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.additionalFiles = []   # Skip copying additional files
 self.__finish()
 def __finish(self):
 """
 Private slot called when the process finished.
-It is called when the process finished or
+It is called when the process finished or the user pressed the
-the user pressed the cancel button.
+cancel button.
 """
 if self.process is not None:
 self.process.disconnect(self.__finishedFreeze)
 self.process.terminate()
 QTimer.singleShot(2000, self.process.kill)
 def __finishedFreeze(self):
 """
 Private slot called when the process finished.
-It is called when the process finished or
+It is called when the process finished or the user pressed the
-the user pressed the cancel button.
+cancel button.
 """
 self.process = None
 self.contents.insertPlainText(
 self.tr('\n{0} finished.\n').format(self.cmdname))
 It is called when the process finished or
 the user pressed the cancel button.
 """
 self.copyProcess = None
-self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True)
+self.buttonBox.button(
-self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False)
+QDialogButtonBox.StandardButton.Close).setEnabled(True)
-self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)
+self.buttonBox.button(
+QDialogButtonBox.StandardButton.Cancel).setEnabled(False)
+self.buttonBox.button(
+QDialogButtonBox.StandardButton.Close).setDefault(True)
 self.contents.ensureCursorVisible()
 def __readStdout(self):
 """
 Private slot to handle the readyReadStandardOutput signal.
 It reads the output of the process, formats it and inserts it into
 the contents pane.
 """
-self.process.setReadChannel(QProcess.StandardOutput)
+self.process.setReadChannel(QProcess.ProcessChannel.StandardOutput)
 while self.process.canReadLine():
 s = str(self.process.readAllStandardOutput(),
 Preferences.getSystem("IOEncoding"),
 'replace')
 Private slot to handle the readyReadStandardError signal.
 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():
 self.errorGroup.show()
 s = str(self.process.readAllStandardError(),
 Preferences.getSystem("IOEncoding"),
 """
 Private method to copy a file or folder.
 Wildcards allowed. Existing files are overwitten.
-@param src source file or folder to copy. Wildcards allowed. (str)
+@param src source file or folder to copy. Wildcards allowed.
-@param dst destination (str)
+@type str
-@exception OSError raised if there is an issue writing the package
+@param dst destination
-@exception OSError raised if the given source does not exist
+@type str
-"""                                             # __IGNORE_WARNING__
+@exception OSError raised if there is an issue writing the package or
+the given source does not exist
+"""
 def src2dst(srcname, base, dst):
 """
 Combines the relativ path of the source (srcname) with the
 destination folder.
 @param srcname actual file or folder to copy
+@type str
 @param base basename of the source folder
+@type str
 @param dst basename of the destination folder
+@type str
 @return destination path
+@rtype str
 """
 delta = srcname.split(base)[1]
 return os.path.join(dst, delta[1:])
 base, fileOrFolderName = os.path.split(src)
 initDone = False
 for root, dirs, files in os.walk(base):
 copied = False
-# remove all none matching directorynames, create all others
+# remove all none matching directory names, create all others
 for directory in dirs[:]:
 pathname = os.path.join(root, directory)
 if initDone or fnmatch.fnmatch(pathname, src):
 newDir = src2dst(pathname, base, dst)
 # avoid infinite loop

Mercurial Repositories > cx_freeze Packager / file comparison

comparison: CxFreeze/CxfreezeExecDialog.py

CxFreeze/CxfreezeExecDialog.py