Mercurial Repositories > eric / file comparison
comparison: src/eric7/Debugger/DebuggerInterfacePython.py
src/eric7/Debugger/DebuggerInterfacePython.py
- branch
- server
- changeset 10766
- d35d6f96c24b
- parent 10764
- 5915ca2466b2
- child 10814
- ba20efe10336
- child 10928
- 46651e194fbe
equal
deleted
inserted
replaced
| 10765:b0632e55ec9a | 10766:d35d6f96c24b |
|---|---|
| 539 ) | 539 ) |
| 540 ) | 540 ) |
| 541 ) and ericApp().getObject("EricServer").isServerConnected(): | 541 ) and ericApp().getObject("EricServer").isServerConnected(): |
| 542 # TODO change this once server environment definitions are supported | 542 # TODO change this once server environment definitions are supported |
| 543 startRemote = True | 543 startRemote = True |
| 544 venvName = self.debugServer.getEricServerEnvironmentString() | 544 if venvName and venvName != self.debugServer.getProjectEnvironmentString(): |
| 545 interpreter = "" # use the interpreter of the server | 545 venvManager = ericApp().getObject("VirtualEnvManager") |
| 546 interpreter = venvManager.getVirtualenvInterpreter(venvName) | |
| 547 else: | |
| 548 venvName = project.getProjectVenv() | |
| 549 interpreter = project.getProjectInterpreter() | |
| 550 if not venvName: | |
| 551 venvName = self.debugServer.getEricServerEnvironmentString() | |
| 552 interpreter = "" # use the interpreter of the server | |
| 546 else: | 553 else: |
| 547 if venvName and venvName != self.debugServer.getProjectEnvironmentString(): | 554 if venvName and venvName != self.debugServer.getProjectEnvironmentString(): |
| 548 venvManager = ericApp().getObject("VirtualEnvManager") | 555 venvManager = ericApp().getObject("VirtualEnvManager") |
| 549 interpreter = venvManager.getVirtualenvInterpreter(venvName) | 556 interpreter = venvManager.getVirtualenvInterpreter(venvName) |
| 550 execPath = venvManager.getVirtualenvExecPath(venvName) | 557 execPath = venvManager.getVirtualenvExecPath(venvName) |
