Mercurial Repositories > eric / file comparison
comparison: src/eric7/Debugger/DebugServer.py
src/eric7/Debugger/DebugServer.py
- branch
- server
- changeset 10555
- 08e853c0c77b
- parent 10439
- 21c28b0f9e41
- child 10561
- be23a662d709
equal
deleted
inserted
replaced
| 10551:d80184d38152 | 10555:08e853c0c77b |
|---|---|
| 490 unplanned=True, | 490 unplanned=True, |
| 491 clType=None, | 491 clType=None, |
| 492 forProject=False, | 492 forProject=False, |
| 493 runInConsole=False, | 493 runInConsole=False, |
| 494 venvName="", | 494 venvName="", |
| 495 workingDir=None, | 495 workingDir="", |
| 496 configOverride=None, | 496 configOverride=None, |
| 497 startRemote=False | |
| 497 ): | 498 ): |
| 498 """ | 499 """ |
| 499 Public method to start a debug client. | 500 Public method to start a debug client. |
| 500 | 501 |
| 501 @param unplanned flag indicating that the client has died | 502 @param unplanned flag indicating that the client has died (defaults to True) |
| 502 @type bool | 503 @type bool (optional) |
| 503 @param clType type of client to be started | 504 @param clType type of client to be started (defaults to None) |
| 504 @type str | 505 @type str (optional) |
| 505 @param forProject flag indicating a project related action | 506 @param forProject flag indicating a project related action (defaults to False) |
| 506 @type bool | 507 @type bool (optional) |
| 507 @param runInConsole flag indicating to start the debugger in a | 508 @param runInConsole flag indicating to start the debugger in a |
| 508 console window | 509 console window (defaults to False) |
| 509 @type bool | 510 @type bool (optional) |
| 510 @param venvName name of the virtual environment to be used | 511 @param venvName name of the virtual environment to be used (defaults to "") |
| 511 @type str | 512 @type str (optional) |
| 512 @param workingDir directory to start the debugger client in | 513 @param workingDir directory to start the debugger client in (defaults to "") |
| 513 @type str | 514 @type str (optional) |
| 514 @param configOverride dictionary containing the global config override | 515 @param configOverride dictionary containing the global config override data |
| 515 data | 516 (defaults to None) |
| 516 @type dict | 517 @type dict (optional) |
| 518 @param startRemote flag indicating to start the client via an eric-ide server | |
| 519 (defaults to False) | |
| 520 @type bool (optional) | |
| 517 """ | 521 """ |
| 518 self.running = False | 522 self.running = False |
| 519 | 523 |
| 520 if ( | 524 if ( |
| 521 (not self.passive or not self.passiveClientExited) | 525 (not self.passive or not self.passiveClientExited) |
| 558 runInConsole, | 562 runInConsole, |
| 559 venvName, | 563 venvName, |
| 560 self.__originalPathString, | 564 self.__originalPathString, |
| 561 workingDir=workingDir, | 565 workingDir=workingDir, |
| 562 configOverride=configOverride, | 566 configOverride=configOverride, |
| 567 startRemote=startRemote, | |
| 563 ) | 568 ) |
| 564 else: | 569 else: |
| 565 ( | 570 ( |
| 566 self.clientProcess, | 571 self.clientProcess, |
| 567 isNetworked, | 572 isNetworked, |
| 571 runInConsole, | 576 runInConsole, |
| 572 venvName, | 577 venvName, |
| 573 self.__originalPathString, | 578 self.__originalPathString, |
| 574 workingDir=workingDir, | 579 workingDir=workingDir, |
| 575 configOverride=configOverride, | 580 configOverride=configOverride, |
| 581 # TODO: add 'startRemote' parameter | |
| 576 ) | 582 ) |
| 577 else: | 583 else: |
| 578 ( | 584 ( |
| 579 self.clientProcess, | 585 self.clientProcess, |
| 580 isNetworked, | 586 isNetworked, |
| 584 runInConsole, | 590 runInConsole, |
| 585 venvName, | 591 venvName, |
| 586 self.__originalPathString, | 592 self.__originalPathString, |
| 587 workingDir=workingDir, | 593 workingDir=workingDir, |
| 588 configOverride=configOverride, | 594 configOverride=configOverride, |
| 595 startRemote=startRemote, | |
| 589 ) | 596 ) |
| 590 | 597 |
| 591 if self.clientProcess: | 598 if self.clientProcess: |
| 592 self.clientProcess.readyReadStandardError.connect( | 599 self.clientProcess.readyReadStandardError.connect( |
| 593 self.__clientProcessError | 600 self.__clientProcessError |
| 601 self.lastClientType = self.clientType | 608 self.lastClientType = self.clientType |
| 602 self.remoteBanner() | 609 self.remoteBanner() |
| 603 elif self.__autoClearShell: | 610 elif self.__autoClearShell: |
| 604 self.__autoClearShell = False | 611 self.__autoClearShell = False |
| 605 self.remoteBanner() | 612 self.remoteBanner() |
| 613 elif startRemote: | |
| 614 self.remoteBanner() | |
| 606 else: | 615 else: |
| 607 if clType and self.lastClientType: | 616 if clType and self.lastClientType: |
| 608 self.__setClientType(self.lastClientType) | 617 self.__setClientType(self.lastClientType) |
| 609 else: | 618 else: |
| 610 self.__createDebuggerInterface("None") | 619 self.__createDebuggerInterface("None") |
| 2221 else: | 2230 else: |
| 2222 return "" | 2231 return "" |
| 2223 except KeyError: | 2232 except KeyError: |
| 2224 # The project object is not present | 2233 # The project object is not present |
| 2225 return "" | 2234 return "" |
| 2235 | |
| 2236 def getEricServerEnvironmentString(self): | |
| 2237 """ | |
| 2238 Public method to get the string for an eric-ide server environment. | |
| 2239 """ | |
| 2240 # TODO: make this more elaborate once server environments definitions | |
| 2241 # are supported | |
| 2242 return "eric-ide Server" |
