Mercurial Repositories > eric / file comparison
comparison: Debugger/DebugServer.py
Debugger/DebugServer.py
- changeset 6621
- db2ec0feca8a
- parent 6581
- 8eb6220f2bb7
- child 6633
- c5aab2ede19a
equal
deleted
inserted
replaced
| 6620:70b774359e5a | 6621:db2ec0feca8a |
|---|---|
| 230 "Python3VirtualEnv") == '' and sys.version_info[0] == 2: | 230 "Python3VirtualEnv") == '' and sys.version_info[0] == 2: |
| 231 self.clientType = 'Python2' | 231 self.clientType = 'Python2' |
| 232 | 232 |
| 233 self.lastClientType = '' | 233 self.lastClientType = '' |
| 234 self.__autoClearShell = False | 234 self.__autoClearShell = False |
| 235 self.__forProject = False | |
| 235 | 236 |
| 236 self.clientClearBreak.connect(self.__clientClearBreakPoint) | 237 self.clientClearBreak.connect(self.__clientClearBreakPoint) |
| 237 self.clientClearWatch.connect(self.__clientClearWatchPoint) | 238 self.clientClearWatch.connect(self.__clientClearWatchPoint) |
| 238 self.newConnection.connect(self.__newConnection) | 239 self.newConnection.connect(self.__newConnection) |
| 239 | 240 |
| 496 self.clientProcess.kill() | 497 self.clientProcess.kill() |
| 497 self.clientProcess.waitForFinished(1000) | 498 self.clientProcess.waitForFinished(1000) |
| 498 self.clientProcess.deleteLater() | 499 self.clientProcess.deleteLater() |
| 499 self.clientProcess = None | 500 self.clientProcess = None |
| 500 | 501 |
| 502 self.__forProject = forProject | |
| 501 self.__createDebuggerInterface() | 503 self.__createDebuggerInterface() |
| 502 if forProject: | 504 if forProject: |
| 503 project = e5App().getObject("Project") | 505 project = e5App().getObject("Project") |
| 504 if not project.isDebugPropertiesLoaded(): | 506 if not project.isDebugPropertiesLoaded(): |
| 505 self.clientProcess, isNetworked, clientInterpreter = \ | 507 self.clientProcess, isNetworked, clientInterpreter = \ |
| 1498 self.__passiveShutDown() | 1500 self.__passiveShutDown() |
| 1499 self.clientExit.emit(int(status), message) | 1501 self.clientExit.emit(int(status), message) |
| 1500 if Preferences.getDebugger("AutomaticReset") or (self.running and | 1502 if Preferences.getDebugger("AutomaticReset") or (self.running and |
| 1501 not self.debugging): | 1503 not self.debugging): |
| 1502 self.debugging = False | 1504 self.debugging = False |
| 1503 self.startClient(False) | 1505 self.startClient(False, forProject=self.__forProject) |
| 1504 if self.passive: | 1506 if self.passive: |
| 1505 self.__createDebuggerInterface("None") | 1507 self.__createDebuggerInterface("None") |
| 1506 self.signalClientOutput(self.tr('\nNot connected\n')) | 1508 self.signalClientOutput(self.tr('\nNot connected\n')) |
| 1507 self.signalClientStatement(False) | 1509 self.signalClientStatement(False) |
| 1508 self.running = False | 1510 self.running = False |
