Mercurial Repositories > eric / changeset

--- a/eric6/DebugClients/Python/DebugClientBase.py	Sun Jan 26 19:29:06 2020 +0100
+++ b/eric6/DebugClients/Python/DebugClientBase.py	Mon Jan 27 19:50:40 2020 +0100
@@ -1001,6 +1001,10 @@
             response
         @type dict
         """
+        # send debugger ID with all responses
+        if "debuggerId" not in params:
+            params["debuggerId"] = self.__debuggerId
+        
         cmd = prepareJsonCommand(method, params)
         
         self.writestream.write_p(cmd)
@@ -1120,9 +1124,8 @@
             hostname and process ID)
         @type str
         """
-        self.sendJsonCommand("DebuggerId", {
-            "id": self.__debuggerId,
-        })
+        # debugger ID is added automatically by sendJsonCommand
+        self.sendJsonCommand("DebuggerId", {})
     
     def __clientCapabilities(self):
         """

--- a/eric6/Debugger/DebuggerInterfacePython.py	Sun Jan 26 19:29:06 2020 +0100
+++ b/eric6/Debugger/DebuggerInterfacePython.py	Mon Jan 27 19:50:40 2020 +0100
@@ -1120,7 +1120,7 @@
         params = commandDict["params"]
         
         if method == "DebuggerId":
-            self.__assignDebuggerId(sock, params["id"])
+            self.__assignDebuggerId(sock, params["debuggerId"])
         
         elif method == "ClientOutput":
             self.debugServer.signalClientOutput(params["text"])