Mercurial Repositories > eric / file comparison
comparison: Preferences/__init__.py
Preferences/__init__.py
- branch
- Py2 comp.
- changeset 2573
- 71837b5366d5
- parent 2552
- 1e893ea4e366
- child 2598
- 5d4a7772b646
equal
deleted
inserted
replaced
| 2572:dc6d76ab5d10 | 2573:71837b5366d5 |
|---|---|
| 34 from E5Gui import E5FileDialog | 34 from E5Gui import E5FileDialog |
| 35 | 35 |
| 36 from E5Network.E5Ftp import E5FtpProxyType | 36 from E5Network.E5Ftp import E5FtpProxyType |
| 37 | 37 |
| 38 from Globals import settingsNameOrganization, settingsNameGlobal, settingsNameRecent, \ | 38 from Globals import settingsNameOrganization, settingsNameGlobal, settingsNameRecent, \ |
| 39 isWindowsPlatform, findPython2Interpreters | 39 isWindowsPlatform, findPythonInterpreters |
| 40 | 40 |
| 41 from Project.ProjectBrowserFlags import SourcesBrowserFlag, FormsBrowserFlag, \ | 41 from Project.ProjectBrowserFlags import SourcesBrowserFlag, FormsBrowserFlag, \ |
| 42 ResourcesBrowserFlag, TranslationsBrowserFlag, InterfacesBrowserFlag, \ | 42 ResourcesBrowserFlag, TranslationsBrowserFlag, InterfacesBrowserFlag, \ |
| 43 OthersBrowserFlag, AllBrowsersFlag | 43 OthersBrowserFlag, AllBrowsersFlag |
| 44 | 44 |
| 1245 return int( | 1245 return int( |
| 1246 prefClass.settings.value("Debugger/" + key, prefClass.debuggerDefaults[key])) | 1246 prefClass.settings.value("Debugger/" + key, prefClass.debuggerDefaults[key])) |
| 1247 elif key in ["AllowedHosts"]: | 1247 elif key in ["AllowedHosts"]: |
| 1248 return toList( | 1248 return toList( |
| 1249 prefClass.settings.value("Debugger/" + key, prefClass.debuggerDefaults[key])) | 1249 prefClass.settings.value("Debugger/" + key, prefClass.debuggerDefaults[key])) |
| 1250 elif key == "PythonInterpreter": | 1250 elif key in ["PythonInterpreter", "Python3Interpreter"]: |
| 1251 interpreter = \ | 1251 interpreter = \ |
| 1252 prefClass.settings.value("Debugger/" + key, prefClass.debuggerDefaults[key]) | 1252 prefClass.settings.value("Debugger/" + key, prefClass.debuggerDefaults[key]) |
| 1253 if not interpreter: | 1253 if not interpreter: |
| 1254 interpreters = findPython2Interpreters() | 1254 pyVersion = 2 if key == "PythonInterpreter" else 3 |
| 1255 if sys.version_info[0] == pyVersion: | |
| 1256 return sys.executable | |
| 1257 | |
| 1258 interpreters = findPythonInterpreters(pyVersion) | |
| 1255 if interpreters: | 1259 if interpreters: |
| 1256 if len(interpreters) == 1: | 1260 if len(interpreters) == 1: |
| 1257 interpreter = interpreters[0] | 1261 interpreter = interpreters[0] |
| 1258 else: | 1262 else: |
| 1259 selection, ok = QInputDialog.getItem( | 1263 selection, ok = QInputDialog.getItem( |
| 1260 None, | 1264 None, |
| 1261 QCoreApplication.translate("Preferences", | 1265 QCoreApplication.translate("Preferences", |
| 1262 "Select Python2 Interpreter"), | 1266 "Select Python{0} Interpreter").format(pyVersion), |
| 1263 QCoreApplication.translate("Preferences", | 1267 QCoreApplication.translate("Preferences", |
| 1264 "Select the Python2 interpreter to be used:"), | 1268 "Select the Python{0} interpreter to be used:").format(pyVersion), |
| 1265 interpreters, | 1269 interpreters, |
| 1266 0, False) | 1270 0, False) |
| 1267 if ok and selection != "": | 1271 if ok and selection != "": |
| 1268 interpreter = selection | 1272 interpreter = selection |
| 1269 if interpreter: | 1273 if interpreter: |
| 1270 setDebugger("PythonInterpreter", interpreter) | 1274 setDebugger(key, interpreter) |
| 1271 return interpreter | 1275 return interpreter |
| 1272 else: | 1276 else: |
| 1273 return \ | 1277 return \ |
| 1274 prefClass.settings.value("Debugger/" + key, prefClass.debuggerDefaults[key]) | 1278 prefClass.settings.value("Debugger/" + key, prefClass.debuggerDefaults[key]) |
| 1275 | 1279 |
