diff -r 5d807e997391 -r c6011e501282 src/eric7/Debugger/DebugUI.py
--- a/src/eric7/Debugger/DebugUI.py Sat Dec 16 17:52:02 2023 +0100
+++ b/src/eric7/Debugger/DebugUI.py Sun Dec 17 17:15:19 2023 +0100
@@ -64,10 +64,15 @@
Constructor
@param ui reference to the main UI
+ @type UserInterface
@param vm reference to the viewmanager
+ @type ViewManager
@param debugServer reference to the debug server
+ @type DebugServer
@param debugViewer reference to the debug viewer widget
+ @type DebugViewer
@param project reference to the project object
+ @type Project
"""
super().__init__(ui)
@@ -213,6 +218,7 @@
Public method to get the variables filter for a scope.
@param scope flag indicating global (True) or local (False) scope
+ @type bool
@return filters list
@rtype list of str
"""
@@ -811,6 +817,7 @@
Public slot to initialize the project menu.
@return the generated menu
+ @rtype QMenu
"""
dmenu = QMenu(self.tr("&Debug"), self.parent())
dmenu.setTearOffEnabled(True)
@@ -853,8 +860,9 @@
Public slot to initialize the debug toolbars.
@param toolbarManager reference to a toolbar manager object
- (EricToolBarManager)
- @return the generated toolbars (list of QToolBar)
+ @type EricToolBarManager
+ @return the generated toolbars
+ @rtype list of QToolBar
"""
starttb = QToolBar(self.tr("Start"), self.ui)
starttb.setObjectName("StartToolbar")
@@ -914,10 +922,12 @@
"""
Public slot to initialize the argv history.
- @param argsStr the commandline arguments (string)
- @param clearHistories flag indicating, that the list should
- be cleared (boolean)
- @param history list of history entries to be set (list of strings)
+ @param argsStr command line arguments
+ @type str
+ @param clearHistories flag indicating, that the list should be cleared
+ @type bool
+ @param history list of history entries to be set
+ @type list of str
"""
if clearHistories:
del self.argvHistory[1:]
@@ -932,10 +942,12 @@
"""
Public slot to initialize the wd history.
- @param wdStr the working directory (string)
- @param clearHistories flag indicating, that the list should
- be cleared (boolean)
- @param history list of history entries to be set (list of strings)
+ @param wdStr working directory
+ @type str
+ @param clearHistories flag indicating, that the list should be cleared
+ @type bool
+ @param history list of history entries to be set
+ @type list of str
"""
if clearHistories:
del self.wdHistory[1:]
@@ -950,10 +962,12 @@
"""
Public slot to initialize the env history.
- @param envStr the environment settings (string)
- @param clearHistories flag indicating, that the list should
- be cleared (boolean)
- @param history list of history entries to be set (list of strings)
+ @param envStr the environment settings
+ @type str
+ @param clearHistories flag indicating, that the list should be cleared
+ @type bool
+ @param history list of history entries to be set
+ @type list of str
"""
if clearHistories:
del self.envHistory[1:]
@@ -977,7 +991,8 @@
"""
Public slot to initialize the exceptions type list.
- @param excList list of exception types (list of strings)
+ @param excList list of exception types
+ @type list of str
"""
self.excList = excList[:] # keep a copy
@@ -985,7 +1000,8 @@
"""
Public slot to initialize the ignored exceptions type list.
- @param excIgnoreList list of ignored exception types (list of strings)
+ @param excIgnoreList list of ignored exception types
+ @type list of str
"""
self.excIgnoreList = excIgnoreList[:] # keep a copy
@@ -994,7 +1010,8 @@
Public slot to initialize the autoClearShell flag.
@param autoClearShell flag indicating, that the interpreter window
- should be cleared (boolean)
+ should be cleared
+ @type bool
"""
self.autoClearShell = autoClearShell
@@ -1003,7 +1020,8 @@
Public slot to initialize the trace Python flag.
@param tracePython flag indicating if the Python library should be
- traced as well (boolean)
+ traced as well
+ @type bool
"""
self.tracePython = tracePython
@@ -1012,7 +1030,8 @@
Public slot to initialize the autoContinue flag.
@param autoContinue flag indicating, that the debugger should not
- stop at the first executable line (boolean)
+ stop at the first executable line
+ @type bool
"""
self.autoContinue = autoContinue
@@ -1021,6 +1040,7 @@
Private slot to handle the editorOpened signal.
@param fn filename of the opened editor
+ @type str
"""
self.editorOpen = True
@@ -1046,6 +1066,7 @@
Private slot to check some actions for their enable/disable status.
@param editor editor window
+ @type Editor
"""
fn = editor.getFileName() if editor else None
@@ -1081,6 +1102,7 @@
Private slot handling the cursorChanged signal of the viewmanager.
@param editor editor window
+ @type Editor
"""
if editor is None:
return
@@ -1210,6 +1232,7 @@
This is needed to cleanly close the sockets on Win OS.
@return always true
+ @rtype bool
"""
self.debugServer.shutdownServer()
return True
@@ -1359,12 +1382,14 @@
"""
Private method to handle a syntax error in the debugged program.
- @param message message of the syntax error (string)
+ @param message message of the syntax error
+ @type str
@param filename translated filename of the syntax error position
- (string)
- @param lineNo line number of the syntax error position (integer)
+ @type str
+ @param lineNo line number of the syntax error position
+ @type int
@param characterNo character number of the syntax error position
- (integer)
+ @type int
"""
self.__resetUI()
self.ui.raise_()
@@ -1556,6 +1581,7 @@
Private method to handle the disconnection of the debugger client.
@param unplanned True if the client died, False otherwise
+ @type bool
"""
self.__resetUI()
if unplanned:
@@ -1885,7 +1911,8 @@
"""
Private method to handle the breakpoint selected signal.
- @param act reference to the action that triggered (QAction)
+ @param act reference to the action that triggered
+ @type QAction
"""
qvList = act.data()
filename = qvList[0]
@@ -2061,7 +2088,7 @@
self.debugServer.remoteCoverage(
lastUsedVenvName,
fn,
- argv,
+ Utilities.parseOptionString(argv),
wd,
env,
autoClearShell=self.autoClearShell,
@@ -2256,7 +2283,7 @@
self.debugServer.remoteProfile(
lastUsedVenvName,
fn,
- argv,
+ Utilities.parseOptionString(argv),
wd,
env,
autoClearShell=self.autoClearShell,
@@ -2443,7 +2470,7 @@
self.debugServer.remoteRun(
lastUsedVenvName,
fn,
- argv,
+ Utilities.parseOptionString(argv),
wd,
env,
autoClearShell=self.autoClearShell,
@@ -2665,7 +2692,7 @@
self.debugServer.remoteLoad(
lastUsedVenvName,
fn,
- argv,
+ Utilities.parseOptionString(argv),
wd,
env,
autoClearShell=self.autoClearShell,
@@ -2724,9 +2751,8 @@
@type str or list of str
@param workDir working directory for the script
@type str
- @param environment string defining the additional or changed environment
- variables
- @type str
+ @param environment environment parameter override for the debug run
+ @type str or dict
@param clientType type (language) of the debug client to be used
@type str
@param forProject flag indicating a project related debug session
@@ -2744,7 +2770,7 @@
self.debugViewer.clearCallTrace()
self.debugViewer.setCallTraceToProjectMode(forProject)
- args = shlex.join(argv) if isinstance(argv, list) else argv
+ args = argv if isinstance(argv, list) else shlex.split(argv)
# Ask the client to open the new program.
self.debugServer.remoteLoad(
venvName,
@@ -2819,7 +2845,7 @@
self.debugServer.remoteLoad(
venvName,
fn,
- argv,
+ Utilities.parseOptionString(argv),
wd,
env,
autoClearShell=self.autoClearShell,
@@ -2842,7 +2868,7 @@
self.debugServer.remoteRun(
venvName,
fn,
- argv,
+ Utilities.parseOptionString(argv),
wd,
env,
autoClearShell=self.autoClearShell,
@@ -2857,7 +2883,7 @@
self.debugServer.remoteCoverage(
venvName,
fn,
- argv,
+ Utilities.parseOptionString(argv),
wd,
env,
autoClearShell=self.autoClearShell,
@@ -2873,7 +2899,7 @@
self.debugServer.remoteProfile(
venvName,
fn,
- argv,
+ Utilities.parseOptionString(argv),
wd,
env,
autoClearShell=self.autoClearShell,
@@ -2897,7 +2923,9 @@
Private slot to handle a passive debug session start.
@param fn filename of the debugged script
- @param exc flag to enable exception reporting of the IDE (boolean)
+ @type str
+ @param exc flag to enable exception reporting of the IDE
+ @type bool
"""
# Hide all error highlights
self.viewmanager.unhighlight()
@@ -3065,7 +3093,8 @@
"""
Public method to get a list of all actions.
- @return list of all actions (list of EricAction)
+ @return list of all actions
+ @rtype list of EricAction
"""
return self.actions[:]
