eric: comparison eric6/Debugger/StartDialog.py

-:866adc8c315b
+:0acf98cd089a
 #
 """
 Module implementing the Start Program dialog.
 """
+import os
 from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QComboBox, QInputDialog
 from E5Gui.E5PathPicker import E5PathPickerModes
 from E5Gui.E5Application import e5App
 """
 def __init__(self, caption, lastUsedVenvName, argvList, wdList, envList,
 exceptions,
 parent=None, dialogType=0, modfuncList=None,
 tracePython=False, autoClearShell=True, autoContinue=True,
-autoFork=False, forkChild=False):
+enableMultiprocess=False, multiprocessNoDebugHistory=None):
 """
 Constructor
 @param caption the caption to be displayed
 @type str
 <li>1 = start run dialog</li>
 <li>2 = start coverage dialog</li>
 <li>3 = start profile dialog</li>
 </ul>
 @type int (0 to 3)
-@keyparam modfuncList history list of module functions
+@param modfuncList history list of module functions
 @type list of str
-@keyparam tracePython flag indicating if the Python library should
+@param tracePython flag indicating if the Python library should
 be traced as well
 @type bool
-@keyparam autoClearShell flag indicating, that the interpreter window
+@param autoClearShell flag indicating, that the interpreter window
 should be cleared automatically
 @type bool
-@keyparam autoContinue flag indicating, that the debugger should not
+@param autoContinue flag indicating, that the debugger should not
 stop at the first executable line
 @type bool
-@keyparam autoFork flag indicating the automatic fork mode
+@param enableMultiprocess flag indicating the support for multi process
-@type bool
+debugging
-@keyparam forkChild flag indicating to debug the child after forking
+@type bool
-@type bool
+@param multiprocessNoDebugHistory list of lists with programs not to be
+debugged
+@type list of str
 """
 super(StartDialog, self).__init__(parent)
 self.setModal(True)
 self.dialogType = dialogType
 self.ui.consoleCheckBox.setChecked(False)
 venvIndex = max(0, self.ui.venvComboBox.findText(lastUsedVenvName))
 self.ui.venvComboBox.setCurrentIndex(venvIndex)
 if dialogType == 0:        # start debug dialog
+enableMultiprocessGlobal = Preferences.getDebugger(
+"MultiProcessEnabled")
 self.ui.tracePythonCheckBox.setChecked(tracePython)
 self.ui.tracePythonCheckBox.show()
 self.ui.autoContinueCheckBox.setChecked(autoContinue)
-self.ui.forkModeCheckBox.setChecked(autoFork)
+self.ui.multiprocessGroup.setEnabled(enableMultiprocessGlobal)
-self.ui.forkChildCheckBox.setChecked(forkChild)
+self.ui.multiprocessGroup.setChecked(
+enableMultiprocess & enableMultiprocessGlobal)
-if dialogType == 1:       # start run dialog
+self.ui.multiprocessNoDebugCombo.clear()
-self.ui.forkModeCheckBox.setChecked(autoFork)
+self.ui.multiprocessNoDebugCombo.setToolTip(self.tr(
-self.ui.forkChildCheckBox.setChecked(forkChild)
+"Enter the list of programs or program patterns not to be"
+" debugged separated by '{0}'.").format(os.pathsep)
+)
+if multiprocessNoDebugHistory:
+self.ui.multiprocessNoDebugCombo.addItems(
+multiprocessNoDebugHistory)
+self.ui.multiprocessNoDebugCombo.setCurrentIndex(0)
 if dialogType == 3:       # start coverage or profile dialog
 self.ui.eraseCheckBox.setChecked(True)
 self.__clearHistoryLists = False
 def getData(self):
 """
 Public method to retrieve the data entered into this dialog.
-@return a tuple of interpreter (string), argv (string), workdir
+@return a tuple of interpreter, argv, workdir, environment,
-(string), environment (string), exceptions flag (boolean),
+exceptions flag, clear interpreter flag and run in console flag
-clear interpreter flag (boolean) and run in console flag (boolean)
+@rtype tuple of (str, str, str, str, bool, bool, bool)
 """
 cmdLine = self.ui.cmdlineCombo.currentText()
 workdir = self.ui.workdirPicker.currentText(toNative=False)
 environment = self.ui.environmentCombo.currentText()
 venvName = self.ui.venvComboBox.currentText()
 Public method to retrieve the debug related data entered into this
 dialog.
 @return a tuple of a flag indicating, if the Python library should be
 traced as well, a flag indicating, that the debugger should not
-stop at the first executable line (boolean), a flag indicating,
+stop at the first executable line, a flag indicating to support
-that the debugger should fork automatically (boolean) and a flag
+multi process debugging and a space separated list of programs not
-indicating, that the debugger should debug the child process after
+to be debugged
-forking automatically (boolean)
+@rtype tuple of (bool, bool, bool, str)
 """
 if self.dialogType == 0:
 return (self.ui.tracePythonCheckBox.isChecked(),
 self.ui.autoContinueCheckBox.isChecked(),
-self.ui.forkModeCheckBox.isChecked(),
+self.ui.multiprocessGroup.isChecked(),
-self.ui.forkChildCheckBox.isChecked())
+self.ui.multiprocessNoDebugCombo.currentText())
 else:
-return (False, False, False, False)
+return (False, False, False, "")
-def getRunData(self):
-"""
-Public method to retrieve the debug related data entered into this
-dialog.
-@return a tuple of a flag indicating, that the debugger should fork
-automatically (boolean) and a flag indicating, that the debugger
-should debug the child process after forking automatically
-(boolean)
-"""
-if self.dialogType == 1:
-return (self.ui.forkModeCheckBox.isChecked(),
-self.ui.forkChildCheckBox.isChecked())
-else:
-return (False, False)
 def getCoverageData(self):
 """
 Public method to retrieve the coverage related data entered into this
 dialog.
-@return flag indicating erasure of coverage info (boolean)
+@return flag indicating erasure of coverage info
+@rtype bool
 """
 if self.dialogType == 2:
 return self.ui.eraseCheckBox.isChecked()
 else:
 return False
 def getProfilingData(self):
 """
 Public method to retrieve the profiling related data entered into this
 dialog.
-@return flag indicating erasure of profiling info (boolean)
+@return flag indicating erasure of profiling info
+@rtype bool
 """
 if self.dialogType == 3:
 return self.ui.eraseCheckBox.isChecked()
 else:
 return False
 self.ui.environmentCombo.clear()
 self.ui.cmdlineCombo.addItem(cmdLine)
 self.ui.workdirPicker.addItem(workdir)
 self.ui.environmentCombo.addItem(environment)
+if self.dialogType == 0:
+noDebugList = self.ui.multiprocessNoDebugCombo.currentText()
+self.ui.multiprocessNoDebugCombo.clear()
+self.ui.multiprocessNoDebugCombo.addItem(noDebugList)
 def __editHistory(self):
 """
 Private slot to edit a history list.
 """
 "",
 self.tr("Command Line"),
 self.tr("Working Directory"),
 self.tr("Environment"),
 ]
+combos = [
+None,
+self.ui.cmdlineCombo,
+self.ui.workdirPicker,
+self.ui.environmentCombo,
+]
+if self.dialogType == 0:
+histories.append(self.tr("No Debug Programs"))
+combos.append(self.ui.multiprocessNoDebugCombo)
 historyKind, ok = QInputDialog.getItem(
 self,
 self.tr("Edit History"),
 self.tr("Select the history list to be edited:"),
 histories,
 0, False)
 if ok and historyKind:
+history = []
 historiesIndex = histories.index(historyKind)
 if historiesIndex == 2:
 history = self.ui.workdirPicker.getPathItems()
 else:
-history = []
+combo = combos[historiesIndex]
-if historiesIndex == 1:
+if combo:
-combo = self.ui.cmdlineCombo
+for index in range(combo.count()):
-else:
+history.append(combo.itemText(index))
-combo = self.ui.environmentCombo
-for index in range(combo.count()):
-history.append(combo.itemText(index))
-from .StartHistoryEditDialog import StartHistoryEditDialog
+if history:
-dlg = StartHistoryEditDialog(history, self)
+from .StartHistoryEditDialog import StartHistoryEditDialog
+dlg = StartHistoryEditDialog(history, self)
 if dlg.exec() == QDialog.Accepted:
 history = dlg.getHistory()
-if historiesIndex == 1:
+combo = combos[historiesIndex]
-combo = self.ui.cmdlineCombo
+if combo:
-elif historiesIndex == 2:
+combo.clear()
-combo = self.ui.workdirPicker
+combo.addItems(history)
-else:
-combo = self.ui.environmentCombo
+self.__historiesModified = True
-combo.clear()
-combo.addItems(history)
-self.__historiesModified = True
 def historiesModified(self):
 """
 Public method to test for modified histories.
 def getHistories(self):
 """
 Public method to get the lists of histories.
 @return tuple containing the histories of command line arguments,
-working directories, environment settings and interpreters
+working directories, environment settings and no debug programs
+lists
 @rtype tuple of four list of str
 """
+if self.dialogType == 0:
+noDebugHistory = [
+self.ui.multiprocessNoDebugCombo.itemText(index)
+for index in range(self.ui.multiprocessNoDebugCombo.count())
+]
+else:
+noDebugHistory = None
 return (
 [self.ui.cmdlineCombo.itemText(index) for index in range(
 self.ui.cmdlineCombo.count())],
 self.ui.workdirPicker.getPathItems(),
 [self.ui.environmentCombo.itemText(index) for index in range(
 self.ui.environmentCombo.count())],
+noDebugHistory,
 )
 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.clearButton:
 self.__clearHistories()
 elif button == self.editButton:
 self.__editHistory()

Mercurial Repositories > eric / file comparison

comparison: eric6/Debugger/StartDialog.py

eric6/Debugger/StartDialog.py