Mercurial Repositories > eric / file diff

--- a/Utilities/__init__.py	Fri Jun 15 11:56:58 2018 +0200
+++ b/Utilities/__init__.py	Fri Jun 15 18:49:48 2018 +0200
@@ -1766,17 +1766,18 @@
     
     if isWindowsPlatform():
         pysideInterpreters = checkPyside(variant)
-        interpreter = sys.version_info[0] - 2
-        hasPyside = pysideInterpreters[interpreter]
+        interpreterIndex = sys.version_info[0] - 2
+        hasPyside = pysideInterpreters[interpreterIndex]
         # if it isn't the internal interpreter, it has to be the external one
         if not hasPyside:
-            interpreter = not interpreter
-        if interpreter:
-            prefix = os.path.dirname(
-                Preferences.getDebugger("Python3Interpreter"))
+            interpreterIndex = not interpreterIndex
+        if interpreterIndex:
+            venvName = Preferences.getDebugger("Python3VirtualEnv")
         else:
-            prefix = os.path.dirname(
-                Preferences.getDebugger("PythonInterpreter"))
+            venvName = Preferences.getDebugger("Python2VirtualEnv")
+        interpreter = e5App().getObject("VirtualEnvManager")\
+            .getVirtualenvInterpreter(venvName)
+        prefix = os.path.dirname(interpreter)
         if toolname in ["pyside-uic", "pyside2-uic"]:
             return os.path.join(prefix, "Scripts", toolname + '.exe')
         else:
@@ -1809,8 +1810,10 @@
     assert variant in ("1", "2")
     
     pysideInformation = []
-    for interpreterName in ["PythonInterpreter", "Python3Interpreter"]:
-        interpreter = Preferences.getDebugger(interpreterName)
+    for venvNameKey in ["Python2VirtualEnv", "Python3VirtualEnv"]:
+        venvName = Preferences.getDebugger(venvNameKey)
+        interpreter = e5App().getObject("VirtualEnvManager")\
+            .getVirtualenvInterpreter(venvName)
         if interpreter == "" or not isinpath(interpreter):
             hasPyside = False
         else: