Mercurial Repositories > eric / file diff

--- a/eric6/Utilities/BackgroundService.py	Sat Jun 20 17:36:20 2020 +0200
+++ b/eric6/Utilities/BackgroundService.py	Sun Jun 21 18:26:12 2020 +0200
@@ -67,17 +67,15 @@
         ## Note: Need the port if started external in debugger:
         print('BackgroundService listening on: {0:d}'.format(port))
         # __IGNORE_WARNING__
-        for pyName in ['Python2', 'Python3']:
-            venvName = Preferences.getDebugger(
-                pyName + "VirtualEnv")
-            interpreter = e5App().getObject(
-                "VirtualEnvManager").getVirtualenvInterpreter(venvName)
-            if not interpreter and int(pyName[-1]) == sys.version_info[0]:
-                interpreter = sys.executable.replace("w.exe", ".exe")
-            if interpreter:
-                process = self.__startExternalClient(interpreter, port)
-                if process:
-                    self.processes[pyName] = process, interpreter
+        venvName = Preferences.getDebugger("Python3VirtualEnv")
+        interpreter = e5App().getObject(
+            "VirtualEnvManager").getVirtualenvInterpreter(venvName)
+        if not interpreter:
+            interpreter = sys.executable.replace("w.exe", ".exe")
+        if interpreter:
+            process = self.__startExternalClient(interpreter, port)
+            if process:
+                self.processes['Python3'] = process, interpreter
 
     def __startExternalClient(self, interpreter, port):
         """
@@ -247,19 +245,17 @@
         """
         Public slot to restart the built in languages.
         """
-        for pyName in ['Python2', 'Python3']:
-            venvName = Preferences.getDebugger(
-                pyName + "VirtualEnv")
-            interpreter = e5App().getObject(
-                "VirtualEnvManager").getVirtualenvInterpreter(venvName)
-            if not interpreter and int(pyName[-1]) == sys.version_info[0]:
-                interpreter = sys.executable.replace("w.exe", ".exe")
-            
-            # Tweak the processes list to reflect the changed interpreter
-            proc, inter = self.processes.pop(pyName, [None, None])
-            self.processes[pyName] = proc, interpreter
-            
-            self.restartService(pyName)
+        venvName = Preferences.getDebugger("Python3VirtualEnv")
+        interpreter = e5App().getObject(
+            "VirtualEnvManager").getVirtualenvInterpreter(venvName)
+        if not interpreter:
+            interpreter = sys.executable.replace("w.exe", ".exe")
+        
+        # Tweak the processes list to reflect the changed interpreter
+        proc, inter = self.processes.pop('Python3', [None, None])
+        self.processes['Python3'] = proc, interpreter
+        
+        self.restartService('Python3')
 
     def restartService(self, language, forceKill=False):
         """