Mercurial Repositories > eric / file comparison
comparison: src/eric7/Debugger/DebuggerInterfacePython.py
src/eric7/Debugger/DebuggerInterfacePython.py
- branch
- eric7
- changeset 9388
- bfe7ea6599a3
- parent 9320
- 22eef25d2956
- child 9389
- 7b2344009d7a
equal
deleted
inserted
replaced
| 9387:ce743c468d09 | 9388:bfe7ea6599a3 |
|---|---|
| 181 """ | 181 """ |
| 182 global origPathEnv | 182 global origPathEnv |
| 183 | 183 |
| 184 if not venvName: | 184 if not venvName: |
| 185 venvName = Preferences.getDebugger("Python3VirtualEnv") | 185 venvName = Preferences.getDebugger("Python3VirtualEnv") |
| 186 venvManager = ericApp().getObject("VirtualEnvManager") | 186 if venvName == self.debugServer.getProjectEnvironmentString(): |
| 187 interpreter = venvManager.getVirtualenvInterpreter(venvName) | 187 project = ericApp().getObject("Project") |
| 188 execPath = venvManager.getVirtualenvExecPath(venvName) | 188 venvName = project.getProjectVenv() |
| 189 execPath = project.getProjectExecPath() | |
| 190 interpreter = project.getProjectInterpreter() | |
| 191 else: | |
| 192 venvManager = ericApp().getObject("VirtualEnvManager") | |
| 193 interpreter = venvManager.getVirtualenvInterpreter(venvName) | |
| 194 execPath = venvManager.getVirtualenvExecPath(venvName) | |
| 189 if interpreter == "": | 195 if interpreter == "": |
| 190 # use the interpreter used to run eric for identical variants | 196 # use the interpreter used to run eric for identical variants |
| 191 interpreter = Globals.getPythonExecutable() | 197 interpreter = Globals.getPythonExecutable() |
| 192 if interpreter == "": | 198 if interpreter == "": |
| 193 EricMessageBox.critical( | 199 EricMessageBox.critical( |
| 377 @rtype tuple of (QProcess, bool, str) | 383 @rtype tuple of (QProcess, bool, str) |
| 378 """ | 384 """ |
| 379 global origPathEnv | 385 global origPathEnv |
| 380 | 386 |
| 381 project = ericApp().getObject("Project") | 387 project = ericApp().getObject("Project") |
| 388 # TODO: adjust to embedded env | |
| 382 if not project.isDebugPropertiesLoaded(): | 389 if not project.isDebugPropertiesLoaded(): |
| 383 return None, self.__isNetworked, "" | 390 return None, self.__isNetworked, "" |
| 384 | 391 |
| 385 # start debugger with project specific settings | 392 # start debugger with project specific settings |
| 386 debugClient = project.getDebugProperty("DEBUGCLIENT") | 393 debugClient = project.getDebugProperty("DEBUGCLIENT") |
| 393 noencoding = "--no-encoding" if project.getDebugProperty("NOENCODING") else "" | 400 noencoding = "--no-encoding" if project.getDebugProperty("NOENCODING") else "" |
| 394 multiprocessEnabled = ( | 401 multiprocessEnabled = ( |
| 395 "--multiprocess" if Preferences.getDebugger("MultiProcessEnabled") else "" | 402 "--multiprocess" if Preferences.getDebugger("MultiProcessEnabled") else "" |
| 396 ) | 403 ) |
| 397 | 404 |
| 398 if venvName: | 405 if venvName and venvName != self.debugServer.getProjectEnvironmentString(): |
| 399 venvManager = ericApp().getObject("VirtualEnvManager") | 406 venvManager = ericApp().getObject("VirtualEnvManager") |
| 400 interpreter = venvManager.getVirtualenvInterpreter(venvName) | 407 interpreter = venvManager.getVirtualenvInterpreter(venvName) |
| 401 execPath = venvManager.getVirtualenvExecPath(venvName) | 408 execPath = venvManager.getVirtualenvExecPath(venvName) |
| 402 else: | 409 else: |
| 403 venvName = project.getProjectVenv() | 410 venvName = project.getProjectVenv() |
