Mercurial Repositories > Django Project / file comparison
comparison: ProjectDjango/Project.py
ProjectDjango/Project.py
- changeset 34
- 7b511ce3bc88
- parent 32
- fd79d080b065
- child 36
- af4a5a530a5e
equal
deleted
inserted
replaced
| 33:d2b78ef8b216 | 34:7b511ce3bc88 |
|---|---|
| 1095 """ | 1095 """ |
| 1096 if not language: | 1096 if not language: |
| 1097 language = self.__e5project.getProjectLanguage() | 1097 language = self.__e5project.getProjectLanguage() |
| 1098 if language == "Python3": | 1098 if language == "Python3": |
| 1099 debugEnv = Preferences.getDebugger("Python3Interpreter") | 1099 debugEnv = Preferences.getDebugger("Python3Interpreter") |
| 1100 if not debugEnv and sys.version_info[0] == 3: | |
| 1101 debugEnv = sys.executable | |
| 1100 elif language == "Python2": | 1102 elif language == "Python2": |
| 1101 debugEnv = Preferences.getDebugger("PythonInterpreter") | 1103 debugEnv = Preferences.getDebugger("PythonInterpreter") |
| 1104 if not debugEnv and sys.version_info[0] == 2: | |
| 1105 debugEnv = sys.executable | |
| 1102 else: | 1106 else: |
| 1103 debugEnv = sys.executable | 1107 debugEnv = sys.executable |
| 1104 debugEnv = os.path.dirname(debugEnv) | 1108 debugEnv = os.path.dirname(debugEnv) |
| 1105 if debugEnv and not os.path.exists(debugEnv): | 1109 if debugEnv and not os.path.exists(debugEnv): |
| 1106 debugEnv = sys.exec_prefix | 1110 if (language == "Python3" and sys.version_info[0] == 3) or \ |
| 1111 (language == "Python2" and sys.version_info[0] == 2): | |
| 1112 debugEnv = sys.exec_prefix | |
| 1113 else: | |
| 1114 debugEnv = "" | |
| 1107 return debugEnv | 1115 return debugEnv |
| 1108 | 1116 |
| 1109 def __getDjangoAdminCommand(self, language=""): | 1117 def __getDjangoAdminCommand(self, language=""): |
| 1110 """ | 1118 """ |
| 1111 Private method to build a django-admin.py command. | 1119 Private method to build a django-admin.py command. |
