Mercurial Repositories > eric / file diff

--- a/Project/Project.py	Sun Jun 17 13:09:00 2018 +0200
+++ b/Project/Project.py	Sun Jun 17 16:56:10 2018 +0200
@@ -435,7 +435,7 @@
         self.otherssubdirs = []
         self.vcs = None
         self.vcsRequested = False
-        self.dbgInterpreter = ''
+        self.dbgVirtualEnv = ''
         self.dbgCmdline = ''
         self.dbgWd = ''
         self.dbgEnv = ''
@@ -1242,7 +1242,7 @@
         """
         self.debugPropertiesLoaded = False
         self.debugProperties = {
-            "INTERPRETER": "",
+            "VIRTUALENV": "",
             "DEBUGCLIENT": "",
             "ENVIRONMENTOVERRIDE": False,
             "ENVIRONMENTSTRING": "",
@@ -1282,29 +1282,43 @@
         @param key key of the property (string)
         @return value of the property
         """
-        return self.debugProperties[key]
-        
-    def setDbgInfo(self, interpreter, argv, wd, env, excReporting, excList,
+        if key == "INTERPRETER":
+            return e5App().getObject("VirtualEnvManager")\
+                .getVirtualenvInterpreter(self.debugProperties["VIRTUALENV"])
+        else:
+            return self.debugProperties[key]
+    
+    def setDbgInfo(self, venvName, argv, wd, env, excReporting, excList,
                    excIgnoreList, autoClearShell, tracePython=None,
                    autoContinue=None):
         """
         Public method to set the debugging information.
         
-        @param interpreter interpreter to be used (string)
-        @param argv command line arguments to be used (string)
-        @param wd working directory (string)
-        @param env environment setting (string)
+        @param venvName name of the virtual environment used
+        @type str
+        @param argv command line arguments to be used
+        @type str
+        @param wd working directory
+        @type str
+        @param env environment setting
+        @type str
         @param excReporting flag indicating the highlighting of exceptions
-        @param excList list of exceptions to be highlighted (list of strings)
-        @param excIgnoreList list of exceptions to be ignored (list of strings)
+        @type bool
+        @param excList list of exceptions to be highlighted
+        @type list of str
+        @param excIgnoreList list of exceptions to be ignored
+        @type list of str
         @param autoClearShell flag indicating, that the interpreter window
-            should be cleared (boolean)
+            should be cleared
+        @type bool
         @keyparam tracePython flag to indicate if the Python library should be
-            traced as well (boolean)
+            traced as well
+        @type bool
         @keyparam autoContinue flag indicating, that the debugger should not
-            stop at the first executable line (boolean)
-        """
-        self.dbgInterpreter = interpreter
+            stop at the first executable line
+        @type bool
+        """
+        self.dbgVirtualEnv = venvName
         self.dbgCmdline = argv
         self.dbgWd = wd
         self.dbgEnv = env