diff -r 40a11619ee77 -r ea60ea85067a Debugger/DebugServer.py
--- a/Debugger/DebugServer.py Sat Nov 03 14:16:43 2018 +0100
+++ b/Debugger/DebugServer.py Sat Nov 03 14:19:21 2018 +0100
@@ -81,8 +81,9 @@
signaled a syntax error in a watch expression
@signal clientRawInput(prompt, echo) emitted after a raw input request was
received
- @signal clientBanner(banner) emitted after the client banner was received
- @signal clientCapabilities(int capabilities, string cltype) emitted after
+ @signal clientBanner(version, platform, dbgclient, venvname) emitted after
+ the client banner data was received
+ @signal clientCapabilities(capabilities, cltype, venvname) emitted after
the clients capabilities were received
@signal clientCompletionList(completionList, text) emitted after the client
the commandline completion list and the reworked searchstring was
@@ -137,8 +138,8 @@
clientBreakConditionError = pyqtSignal(str, int)
clientWatchConditionError = pyqtSignal(str)
clientRawInput = pyqtSignal(str, bool)
- clientBanner = pyqtSignal(str, str, str)
- clientCapabilities = pyqtSignal(int, str)
+ clientBanner = pyqtSignal(str, str, str, str)
+ clientCapabilities = pyqtSignal(int, str, str)
clientCompletionList = pyqtSignal(list, str)
clientInterpreterChanged = pyqtSignal(str)
utPrepared = pyqtSignal(int, str, str)
@@ -1541,26 +1542,35 @@
"""
self.clientRawInput.emit(prompt, echo)
- def signalClientBanner(self, version, platform, debugClient):
+ def signalClientBanner(self, version, platform, debugClient, venvName):
"""
Public method to process the client banner info.
- @param version interpreter version info (string)
- @param platform hostname of the client (string)
- @param debugClient additional debugger type info (string)
+ @param version interpreter version info
+ @type str
+ @param platform hostname of the client
+ @type str
+ @param debugClient additional debugger type info
+ @type str
+ @param venvName name of the virtual environment
+ @type str
"""
- self.clientBanner.emit(version, platform, debugClient)
-
- def signalClientCapabilities(self, capabilities, clientType):
+ self.clientBanner.emit(version, platform, debugClient, venvName)
+
+ def signalClientCapabilities(self, capabilities, clientType, venvName):
"""
Public method to process the client capabilities info.
- @param capabilities bitmaks with the client capabilities (integer)
- @param clientType type of the debug client (string)
+ @param capabilities bitmaks with the client capabilities
+ @type int
+ @param clientType type of the debug client
+ @type str
+ @param venvName name of the virtual environment
+ @type str
"""
try:
self.__debuggerInterfaceRegistry[clientType][0] = capabilities
- self.clientCapabilities.emit(capabilities, clientType)
+ self.clientCapabilities.emit(capabilities, clientType, venvName)
except KeyError:
# ignore silently
pass
