Mercurial Repositories > eric / file comparison
comparison: src/eric7/Debugger/DebuggerInterfacePython.py
src/eric7/Debugger/DebuggerInterfacePython.py
- branch
- server
- changeset 10597
- fbe93720ee9f
- parent 10564
- 0de57f082daa
- child 10630
- 552a790fd9bc
equal
deleted
inserted
replaced
| 10596:ea35c92a3c7c | 10597:fbe93720ee9f |
|---|---|
| 50 self.__autoContinued = [] | 50 self.__autoContinued = [] |
| 51 self.__isStepCommand = False | 51 self.__isStepCommand = False |
| 52 | 52 |
| 53 self.__ericServerDebugging = False # are we debugging via the eric-ide server? | 53 self.__ericServerDebugging = False # are we debugging via the eric-ide server? |
| 54 try: | 54 try: |
| 55 self.__ericServerDebuggerInterface = ericApp().getObject( | 55 self.__ericServerDebuggerInterface = ( |
| 56 "EricServer" | 56 ericApp().getObject("EricServer").getServiceInterface("Debugger") |
| 57 ).getServiceInterface("Debugger") | 57 ) |
| 58 self.__ericServerDebuggerInterface.debugClientResponse.connect( | 58 self.__ericServerDebuggerInterface.debugClientResponse.connect( |
| 59 lambda jsonStr: self.handleJsonCommand(jsonStr, None) | 59 lambda jsonStr: self.handleJsonCommand(jsonStr, None) |
| 60 ) | 60 ) |
| 61 self.__ericServerDebuggerInterface.debugClientDisconnected.connect( | 61 self.__ericServerDebuggerInterface.debugClientDisconnected.connect( |
| 62 self.__handleServerDebugClientDisconnected | 62 self.__handleServerDebugClientDisconnected |
| 217 @rtype tuple of (QProcess, bool, str) | 217 @rtype tuple of (QProcess, bool, str) |
| 218 """ | 218 """ |
| 219 global origPathEnv | 219 global origPathEnv |
| 220 | 220 |
| 221 if ( | 221 if ( |
| 222 ( | 222 startRemote is True |
| 223 startRemote is True | 223 or ( |
| 224 or ( | 224 startRemote is None |
| 225 startRemote is None and ( | 225 and ( |
| 226 venvName == self.debugServer.getEricServerEnvironmentString() | 226 venvName == self.debugServer.getEricServerEnvironmentString() |
| 227 or self.__ericServerDebugging | 227 or self.__ericServerDebugging |
| 228 ) | |
| 229 ) | 228 ) |
| 230 ) | 229 ) |
| 231 and ericApp().getObject("EricServer").isServerConnected() | 230 ) and ericApp().getObject("EricServer").isServerConnected(): |
| 232 ): | |
| 233 # TODO change this once server environment definitions are supported | 231 # TODO change this once server environment definitions are supported |
| 234 startRemote = True | 232 startRemote = True |
| 235 venvName = self.debugServer.getEricServerEnvironmentString() | 233 venvName = self.debugServer.getEricServerEnvironmentString() |
| 236 interpreter = "" | 234 interpreter = "" |
| 237 else: | 235 else: |
| 358 if multiprocessEnabled: | 356 if multiprocessEnabled: |
| 359 args.append(multiprocessEnabled) | 357 args.append(multiprocessEnabled) |
| 360 if callTraceOptimization: | 358 if callTraceOptimization: |
| 361 args.append(callTraceOptimization) | 359 args.append(callTraceOptimization) |
| 362 self.__ericServerDebuggerInterface.startClient( | 360 self.__ericServerDebuggerInterface.startClient( |
| 363 interpreter, originalPathString, args, workingDir=workingDir, | 361 interpreter, |
| 362 originalPathString, | |
| 363 args, | |
| 364 workingDir=workingDir, | |
| 364 ) | 365 ) |
| 365 self.__startedVenv = venvName | 366 self.__startedVenv = venvName |
| 366 | 367 |
| 367 return None, self.__isNetworked, "" | 368 return None, self.__isNetworked, "" |
| 368 | 369 |
