Mercurial Repositories > eric / file diff

diff -r ce743c468d09 -r bfe7ea6599a3 src/eric7/Debugger/DebuggerInterfacePython.py
--- a/src/eric7/Debugger/DebuggerInterfacePython.py	Wed Oct 05 09:39:15 2022 +0200
+++ b/src/eric7/Debugger/DebuggerInterfacePython.py	Wed Oct 05 16:19:31 2022 +0200
@@ -183,9 +183,15 @@
 
         if not venvName:
             venvName = Preferences.getDebugger("Python3VirtualEnv")
-        venvManager = ericApp().getObject("VirtualEnvManager")
-        interpreter = venvManager.getVirtualenvInterpreter(venvName)
-        execPath = venvManager.getVirtualenvExecPath(venvName)
+        if venvName == self.debugServer.getProjectEnvironmentString():
+            project = ericApp().getObject("Project")
+            venvName = project.getProjectVenv()
+            execPath = project.getProjectExecPath()
+            interpreter = project.getProjectInterpreter()
+        else:
+            venvManager = ericApp().getObject("VirtualEnvManager")
+            interpreter = venvManager.getVirtualenvInterpreter(venvName)
+            execPath = venvManager.getVirtualenvExecPath(venvName)
         if interpreter == "":
             # use the interpreter used to run eric for identical variants
             interpreter = Globals.getPythonExecutable()
@@ -379,6 +385,7 @@
         global origPathEnv
 
         project = ericApp().getObject("Project")
+        # TODO: adjust to embedded env
         if not project.isDebugPropertiesLoaded():
             return None, self.__isNetworked, ""
 
@@ -395,7 +402,7 @@
             "--multiprocess" if Preferences.getDebugger("MultiProcessEnabled") else ""
         )
 
-        if venvName:
+        if venvName and venvName != self.debugServer.getProjectEnvironmentString():
             venvManager = ericApp().getObject("VirtualEnvManager")
             interpreter = venvManager.getVirtualenvInterpreter(venvName)
             execPath = venvManager.getVirtualenvExecPath(venvName)