Mercurial Repositories > eric / file diff

--- a/Preferences/__init__.py	Wed Apr 10 22:21:27 2013 +0200
+++ b/Preferences/__init__.py	Wed Apr 10 22:33:47 2013 +0200
@@ -36,7 +36,7 @@
 from E5Network.E5Ftp import E5FtpProxyType
 
 from Globals import settingsNameOrganization, settingsNameGlobal, settingsNameRecent, \
-    isWindowsPlatform, findPython2Interpreters
+    isWindowsPlatform, findPythonInterpreters
 
 from Project.ProjectBrowserFlags import SourcesBrowserFlag, FormsBrowserFlag, \
     ResourcesBrowserFlag, TranslationsBrowserFlag, InterfacesBrowserFlag, \
@@ -1247,11 +1247,15 @@
     elif key in ["AllowedHosts"]:
         return toList(
             prefClass.settings.value("Debugger/" + key, prefClass.debuggerDefaults[key]))
-    elif key == "PythonInterpreter":
+    elif key in ["PythonInterpreter", "Python3Interpreter"]:
         interpreter = \
             prefClass.settings.value("Debugger/" + key, prefClass.debuggerDefaults[key])
         if not interpreter:
-            interpreters = findPython2Interpreters()
+            pyVersion = 2 if key == "PythonInterpreter" else 3
+            if sys.version_info[0] == pyVersion:
+                return sys.executable
+
+            interpreters = findPythonInterpreters(pyVersion)
             if interpreters:
                 if len(interpreters) == 1:
                     interpreter = interpreters[0]
@@ -1259,15 +1263,15 @@
                     selection, ok = QInputDialog.getItem(
                         None,
                         QCoreApplication.translate("Preferences",
-                            "Select Python2 Interpreter"),
+                            "Select Python{0} Interpreter").format(pyVersion),
                         QCoreApplication.translate("Preferences",
-                            "Select the Python2 interpreter to be used:"),
+                            "Select the Python{0} interpreter to be used:").format(pyVersion),
                         interpreters,
                         0, False)
                     if ok and selection != "":
                         interpreter = selection
                 if interpreter:
-                    setDebugger("PythonInterpreter", interpreter)
+                    setDebugger(key, interpreter)
         return interpreter
     else:
         return \