Mercurial Repositories > eric / file diff

diff -r 8358c3c95841 -r 29fb6d420a25 eric6/Debugger/DebugServer.py
--- a/eric6/Debugger/DebugServer.py	Sun Mar 14 19:59:27 2021 +0100
+++ b/eric6/Debugger/DebugServer.py	Mon Mar 15 17:55:48 2021 +0100
@@ -484,7 +484,8 @@
                 'DebugClient/Type', self.clientType)
     
     def startClient(self, unplanned=True, clType=None, forProject=False,
-                    runInConsole=False, venvName="", workingDir=None):
+                    runInConsole=False, venvName="", workingDir=None,
+                    configOverride=None):
         """
         Public method to start a debug client.
         
@@ -501,6 +502,9 @@
         @type str
         @param workingDir directory to start the debugger client in
         @type str
+        @param configOverride dictionary containing the global config override
+            data
+        @type dict
         """
         self.running = False
         
@@ -533,17 +537,20 @@
                     self.clientProcess, isNetworked, clientInterpreter = (
                         self.debuggerInterface.startRemote(
                             self.serverPort(), runInConsole, venvName,
-                            self.__originalPathString, workingDir=workingDir))
+                            self.__originalPathString, workingDir=workingDir,
+                            configOverride=configOverride))
                 else:
                     self.clientProcess, isNetworked, clientInterpreter = (
                         self.debuggerInterface.startRemoteForProject(
                             self.serverPort(), runInConsole, venvName,
-                            self.__originalPathString, workingDir=workingDir))
+                            self.__originalPathString, workingDir=workingDir,
+                            configOverride=configOverride))
             else:
                 self.clientProcess, isNetworked, clientInterpreter = (
                     self.debuggerInterface.startRemote(
                         self.serverPort(), runInConsole, venvName,
-                        self.__originalPathString, workingDir=workingDir))
+                        self.__originalPathString, workingDir=workingDir,
+                        configOverride=configOverride))
             
             if self.clientProcess:
                 self.clientProcess.readyReadStandardError.connect(
@@ -933,7 +940,8 @@
     def remoteLoad(self, venvName, fn, argv, wd, env, autoClearShell=True,
                    tracePython=False, autoContinue=True, forProject=False,
                    runInConsole=False, clientType="", enableCallTrace=False,
-                   enableMultiprocess=False, multiprocessNoDebug=""):
+                   enableMultiprocess=False, multiprocessNoDebug="",
+                   configOverride=None):
         """
         Public method to load a new program to debug.
         
@@ -972,6 +980,9 @@
         @param multiprocessNoDebug space separated list of programs not to be
             debugged
         @type str
+        @param configOverride dictionary containing the global config override
+            data
+        @type dict
         """
         self.__autoClearShell = autoClearShell
         self.__multiprocessNoDebugList = [
@@ -999,7 +1010,8 @@
         except KeyError:
             self.__setClientType('Python3')    # assume it is a Python3 file
         self.startClient(False, forProject=forProject,
-                         runInConsole=runInConsole, venvName=venvName)
+                         runInConsole=runInConsole, venvName=venvName,
+                         configOverride=configOverride)
         
         self.setCallTraceEnabled("", enableCallTrace)
         self.remoteEnvironment(env)
@@ -1015,7 +1027,8 @@
         self.__restoreNoDebugList()
     
     def remoteRun(self, venvName, fn, argv, wd, env, autoClearShell=True,
-                  forProject=False, runInConsole=False, clientType=""):
+                  forProject=False, runInConsole=False, clientType="",
+                  configOverride=None):
         """
         Public method to load a new program to run.
         
@@ -1039,6 +1052,9 @@
         @type bool
         @param clientType client type to be used
         @type str
+        @param configOverride dictionary containing the global config override
+            data
+        @type dict
         """
         self.__autoClearShell = autoClearShell
         
@@ -1063,7 +1079,8 @@
         except KeyError:
             self.__setClientType('Python3')    # assume it is a Python3 file
         self.startClient(False, forProject=forProject,
-                         runInConsole=runInConsole, venvName=venvName)
+                         runInConsole=runInConsole, venvName=venvName,
+                         configOverride=configOverride)
         
         self.remoteEnvironment(env)
         
@@ -1073,7 +1090,7 @@
     
     def remoteCoverage(self, venvName, fn, argv, wd, env,
                        autoClearShell=True, erase=False, forProject=False,
-                       runInConsole=False, clientType=""):
+                       runInConsole=False, clientType="", configOverride=None):
         """
         Public method to load a new program to collect coverage data.
         
@@ -1100,6 +1117,9 @@
         @type bool
         @param clientType client type to be used
         @type str
+        @param configOverride dictionary containing the global config override
+            data
+        @type dict
         """
         self.__autoClearShell = autoClearShell
         
@@ -1124,7 +1144,8 @@
         except KeyError:
             self.__setClientType('Python3')    # assume it is a Python3 file
         self.startClient(False, forProject=forProject,
-                         runInConsole=runInConsole, venvName=venvName)
+                         runInConsole=runInConsole, venvName=venvName,
+                         configOverride=configOverride)
         
         self.remoteEnvironment(env)
         
@@ -1134,7 +1155,7 @@
     
     def remoteProfile(self, venvName, fn, argv, wd, env,
                       autoClearShell=True, erase=False, forProject=False,
-                      runInConsole=False, clientType=""):
+                      runInConsole=False, clientType="", configOverride=None):
         """
         Public method to load a new program to collect profiling data.
         
@@ -1161,6 +1182,9 @@
         @type bool
         @param clientType client type to be used
         @type str
+        @param configOverride dictionary containing the global config override
+            data
+        @type dict
         """
         self.__autoClearShell = autoClearShell
         
@@ -1185,7 +1209,8 @@
         except KeyError:
             self.__setClientType('Python3')    # assume it is a Python3 file
         self.startClient(False, forProject=forProject,
-                         runInConsole=runInConsole, venvName=venvName)
+                         runInConsole=runInConsole, venvName=venvName,
+                         configOverride=configOverride)
         
         self.remoteEnvironment(env)