diff -r 21c0a3d40d69 -r 91243eb0390d src/eric7/Debugger/DebuggerInterfacePython.py
--- a/src/eric7/Debugger/DebuggerInterfacePython.py Wed Oct 16 17:39:40 2024 +0200
+++ b/src/eric7/Debugger/DebuggerInterfacePython.py Fri Oct 18 19:14:59 2024 +0200
@@ -192,7 +192,7 @@
originalPathString,
workingDir="",
configOverride=None,
- startRemote=None,
+ startViaServer=None,
):
"""
Public method to start a remote Python interpreter.
@@ -211,7 +211,7 @@
@param configOverride dictionary containing the global config override data
(defaults to None)
@type dict (optional)
- @param startRemote flag indicating to start the client via an eric-ide server
+ @param startViaServer flag indicating to start the client via an eric-ide server
(defaults to None)
@type bool (optional)
@return client process object, a flag to indicate a network connection
@@ -221,16 +221,16 @@
global origPathEnv
if (
- startRemote is True
+ startViaServer is True
or (
- startRemote is None
+ startViaServer is None
and (
venvName == self.debugServer.getEricServerEnvironmentString()
or self.__ericServerDebugging
)
)
) and ericApp().getObject("EricServer").isServerConnected():
- startRemote = True
+ startViaServer = True
if venvName:
venvManager = ericApp().getObject("VirtualEnvManager")
interpreter = venvManager.getVirtualenvInterpreter(venvName)
@@ -281,7 +281,7 @@
else ""
)
- if Preferences.getDebugger("RemoteDbgEnabled"):
+ if Preferences.getDebugger("RemoteDbgEnabled") and not startViaServer:
# remote debugging code
ipaddr = self.debugServer.getHostAddress(False)
rexec = Preferences.getDebugger("RemoteExecution")
@@ -350,7 +350,7 @@
)
return None, False, ""
- elif startRemote and self.__ericServerDebuggerInterface is not None:
+ elif startViaServer and self.__ericServerDebuggerInterface is not None:
# debugging via an eric-ide server
self.translate = self.__ericServerTranslation
self.__ericServerDebugging = True
@@ -480,7 +480,7 @@
originalPathString,
workingDir=None,
configOverride=None,
- startRemote=False,
+ startViaServer=None,
):
"""
Public method to start a remote Python interpreter for a project.
@@ -499,8 +499,8 @@
@param configOverride dictionary containing the global config override
data
@type dict
- @param startRemote flag indicating to start the client via an eric-ide server
- (defaults to False)
+ @param startViaServer flag indicating to start the client via an eric-ide server
+ (defaults to None)
@type bool (optional)
@return client process object, a flag to indicate a network connection
and the name of the interpreter in case of a local execution
@@ -529,16 +529,16 @@
)
if (
- startRemote is True
+ startViaServer is True
or (
- startRemote is None
+ startViaServer is None
and (
venvName == self.debugServer.getEricServerEnvironmentString()
or self.__ericServerDebugging
)
)
) and ericApp().getObject("EricServer").isServerConnected():
- startRemote = True
+ startViaServer = True
if venvName and venvName != self.debugServer.getProjectEnvironmentString():
venvManager = ericApp().getObject("VirtualEnvManager")
interpreter = venvManager.getVirtualenvInterpreter(venvName)
@@ -569,7 +569,7 @@
self.__ericServerDebugging = False
- if project.getDebugProperty("REMOTEDEBUGGER"):
+ if project.getDebugProperty("REMOTEDEBUGGER") and not startViaServer:
# remote debugging code
ipaddr = self.debugServer.getHostAddress(False)
rexec = project.getDebugProperty("REMOTECOMMAND")
@@ -629,7 +629,7 @@
# remote shell command is missing
return None, self.__isNetworked, ""
- elif startRemote and self.__ericServerDebuggerInterface is not None:
+ elif startViaServer and self.__ericServerDebuggerInterface is not None:
# debugging via an eric-ide server
self.translate = self.__ericServerTranslation
self.__ericServerDebugging = True
