diff -r cb2badbdf26c -r 8dcb77600690 eric6/Debugger/DebugUI.py
--- a/eric6/Debugger/DebugUI.py Sun Dec 13 19:54:19 2020 +0100
+++ b/eric6/Debugger/DebugUI.py Mon Dec 14 19:23:25 2020 +0100
@@ -102,11 +102,6 @@
Preferences.Prefs.settings.value('DebugInfo/TracePython', False))
self.autoContinue = Preferences.toBool(
Preferences.Prefs.settings.value('DebugInfo/AutoContinue', True))
- self.forkAutomatically = Preferences.toBool(
- Preferences.Prefs.settings.value(
- 'DebugInfo/ForkAutomatically', False))
- self.forkIntoChild = Preferences.toBool(
- Preferences.Prefs.settings.value('DebugInfo/ForkIntoChild', False))
self.enableMultiprocess = Preferences.toBool(
Preferences.Prefs.settings.value(
'DebugInfo/EnableMultiprocess', False))
@@ -961,10 +956,6 @@
Preferences.Prefs.settings.setValue(
'DebugInfo/AutoContinue', self.autoContinue)
Preferences.Prefs.settings.setValue(
- 'DebugInfo/ForkAutomatically', self.forkAutomatically)
- Preferences.Prefs.settings.setValue(
- 'DebugInfo/ForkIntoChild', self.forkIntoChild)
- Preferences.Prefs.settings.setValue(
'DebugInfo/EnableMultiprocess', self.enableMultiprocess)
Preferences.Prefs.settings.setValue(
'DebugInfo/MultiprocessNoDebugHistory',
@@ -1922,13 +1913,10 @@
dlg = StartDialog(
cap, self.lastUsedVenvName, self.argvHistory, self.wdHistory,
self.envHistory, self.exceptions, self.ui, 1,
- autoClearShell=self.autoClearShell,
- autoFork=self.forkAutomatically,
- forkChild=self.forkIntoChild)
+ autoClearShell=self.autoClearShell)
if dlg.exec() == QDialog.Accepted:
(lastUsedVenvName, argv, wd, env, exceptions, clearShell,
console) = dlg.getData()
- forkAutomatically, forkIntoChild = dlg.getRunData()
if runProject:
fn = self.project.getMainScript(True)
@@ -1993,10 +1981,6 @@
# Save the run in console flag
self.runInConsole = console
- # Save the forking flags
- self.forkAutomatically = forkAutomatically
- self.forkIntoChild = forkIntoChild
-
# Hide all error highlights
self.viewmanager.unhighlight()
@@ -2012,8 +1996,7 @@
self.debugServer.remoteRun(
lastUsedVenvName, fn, argv, wd, env,
autoClearShell=self.autoClearShell, forProject=runProject,
- runInConsole=console, autoFork=forkAutomatically,
- forkChild=forkIntoChild, clientType=self.clientType)
+ runInConsole=console, clientType=self.clientType)
self.stopAct.setEnabled(True)
@@ -2063,16 +2046,14 @@
cap, self.lastUsedVenvName, self.argvHistory, self.wdHistory,
self.envHistory, self.exceptions, self.ui, 0,
tracePython=self.tracePython, autoClearShell=self.autoClearShell,
- autoContinue=self.autoContinue, autoFork=self.forkAutomatically,
- forkChild=self.forkIntoChild,
+ autoContinue=self.autoContinue,
enableMultiprocess=self.enableMultiprocess,
multiprocessNoDebugHistory=self.multiprocessNoDebugHistory)
if dlg.exec() == QDialog.Accepted:
(lastUsedVenvName, argv, wd, env, exceptions, clearShell,
console) = dlg.getData()
- (tracePython, autoContinue, forkAutomatically, forkIntoChild,
- enableMultiprocess, multiprocessNoDebug,
- ) = dlg.getDebugData()
+ (tracePython, autoContinue, enableMultiprocess,
+ multiprocessNoDebug) = dlg.getDebugData()
if debugProject:
fn = self.project.getMainScript(True)
@@ -2143,10 +2124,6 @@
# Save the auto continue flag
self.autoContinue = autoContinue
- # Save the forking flags
- self.forkAutomatically = forkAutomatically
- self.forkIntoChild = forkIntoChild
-
# Save the multiprocess debugging data
self.enableMultiprocess = enableMultiprocess
self.setMultiprocessNoDebugHistory(multiprocessNoDebug)
@@ -2174,8 +2151,7 @@
autoClearShell=self.autoClearShell,
tracePython=tracePython,
autoContinue=autoContinue, forProject=debugProject,
- runInConsole=console, autoFork=forkAutomatically,
- forkChild=forkIntoChild, clientType=self.clientType,
+ runInConsole=console, clientType=self.clientType,
enableCallTrace=enableCallTrace,
enableMultiprocess=enableMultiprocess,
multiprocessNoDebug=multiprocessNoDebug)
@@ -2264,8 +2240,6 @@
autoContinue=self.autoContinue,
forProject=forProject,
runInConsole=self.runInConsole,
- autoFork=self.forkAutomatically,
- forkChild=self.forkIntoChild,
clientType=self.clientType,
enableCallTrace=enableCallTrace,
enableMultiprocess=self.enableMultiprocess,
@@ -2281,8 +2255,6 @@
autoClearShell=self.autoClearShell,
forProject=forProject,
runInConsole=self.runInConsole,
- autoFork=self.forkAutomatically,
- forkChild=self.forkIntoChild,
clientType=self.clientType)
elif self.lastStartAction in [5, 6]:
