eric: comparison src/eric7/Debugger/DebuggerInterfacePython.py

-:c8df46dd566d
+:27cd57e98461
 import contextlib
 import json
 import logging
 import os
+import re
 import shlex
 import struct
 import time
 import zlib
 @type bool (optional)
 @return translated filename
 @rtype str
 """
 if remote2local:
-path = fn.replace(self.translateRemote, self.translateLocal)
+path = (
+re.sub(
+f"^{re.escape(self.translateRemote)}",
+self.translateLocal,
+fn,
+flags=re.IGNORECASE,
+)
+if self.translateRemoteWindows
+else fn.replace(self.translateRemote, self.translateLocal)
+)
 if self.translateLocalWindows:
 path = path.replace("/", "\\")
 else:
-path = fn.replace(self.translateLocal, self.translateRemote)
+path = (
+re.sub(
+f"^{re.escape(self.translateLocal)}",
+self.translateRemote,
+fn,
+flags=re.IGNORECASE,
+)
+if self.translateLocalWindows
+else fn.replace(self.translateLocal, self.translateRemote)
+)
 if not self.translateRemoteWindows:
 path = path.replace("\\", "/")
 return path
 runInConsole,
 venvName,
 originalPathString,
 workingDir="",
 configOverride=None,
-startRemote=None,
+startViaServer=None,
 ):
 """
 Public method to start a remote Python interpreter.
 @param port port number the debug server is listening on
 @param workingDir directory to start the debugger client in (defaults to "")
 @type str (optional)
 @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
 and the name of the interpreter in case of a local execution
 @rtype tuple of (QProcess, bool, str)
 """
 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():
-# TODO change this once server environment definitions are supported
+startViaServer = True
-startRemote = True
 if venvName:
 venvManager = ericApp().getObject("VirtualEnvManager")
 interpreter = venvManager.getVirtualenvInterpreter(venvName)
 else:
 venvName = self.debugServer.getEricServerEnvironmentString()
 "--call-trace-optimization"
 if Preferences.getDebugger("PythonCallTraceOptimization")
 else ""
 )
-if Preferences.getDebugger("RemoteDbgEnabled"):
+if Preferences.getDebugger("RemoteDbgEnabled") and not startViaServer:
 # remote debugging code
 ipaddr = self.debugServer.getHostAddress(False)
 rexec = Preferences.getDebugger("RemoteExecution")
 rhost = Preferences.getDebugger("RemoteHost")
 if rhost == "":
 " login was given.</p>"
 ),
 )
 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
 args = []
 runInConsole,
 venvName,
 originalPathString,
 workingDir=None,
 configOverride=None,
-startRemote=False,
+startViaServer=None,
 ):
 """
 Public method to start a remote Python interpreter for a project.
 @param port port number the debug server is listening on
 @param workingDir directory to start the debugger client in
 @type str
 @param configOverride dictionary containing the global config override
 data
 @type dict
-@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 False)
+(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
 @rtype tuple of (QProcess, bool, str)
 """
 if Preferences.getDebugger("PythonCallTraceOptimization")
 else ""
 )
 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():
-# TODO change this once server environment definitions are supported
+startViaServer = True
-startRemote = True
 if venvName and venvName != self.debugServer.getProjectEnvironmentString():
 venvManager = ericApp().getObject("VirtualEnvManager")
 interpreter = venvManager.getVirtualenvInterpreter(venvName)
 else:
 venvName = project.getProjectVenv()
 self.__inShutdown = False
 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")
 rhost = project.getDebugProperty("REMOTEHOST")
 if rhost == "":
 self.translateLocal = project.getDebugProperty("LOCALPATH")
 self.translateLocalWindows = "\\" in self.translateLocal
 self.translate = self.__remoteTranslation
 else:
 self.translate = self.__identityTranslation
+self.__startedVenv = "" if process is None else venvName
 return process, self.__isNetworked, ""
 else:
 # 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
 args = []
 for jsonStr in self.__commandQueue:
 self.__ericServerDebuggerInterface.sendClientCommand(
 self.__mainDebugger, jsonStr
 )
 else:
-conn = self.__connections[self.__mainDebugger]
+with contextlib.suppress(KeyError):
-for jsonStr in self.__commandQueue:
+conn = self.__connections[self.__mainDebugger]
-self.__writeJsonCommandToSocket(jsonStr, conn)
+for jsonStr in self.__commandQueue:
+self.__writeJsonCommandToSocket(jsonStr, conn)
 self.__commandQueue.clear()
 def shutdown(self):
 """

Mercurial Repositories > eric / file comparison

comparison: src/eric7/Debugger/DebuggerInterfacePython.py

src/eric7/Debugger/DebuggerInterfacePython.py