Mercurial Repositories > Django Project / file comparison
comparison: ProjectDjango/Project.py
ProjectDjango/Project.py
- branch
- eric7
- changeset 178
- 60c87e256fc7
- parent 176
- 1395e0583f4e
- child 180
- 64339135bd61
equal
deleted
inserted
replaced
| 177:bcea236d0e65 | 178:60c87e256fc7 |
|---|---|
| 1303 virtualEnv = self.__getVirtualEnvironment(language) | 1303 virtualEnv = self.__getVirtualEnvironment(language) |
| 1304 if virtualEnv: | 1304 if virtualEnv: |
| 1305 if isWindowsPlatform(): | 1305 if isWindowsPlatform(): |
| 1306 for cmd in [ | 1306 for cmd in [ |
| 1307 # standard Python | 1307 # standard Python |
| 1308 os.path.join(virtualEnv, "Scripts", "django-admin.py"), | 1308 os.path.join(virtualEnv, "Scripts", "django-admin.exe"), |
| 1309 # PyPy | 1309 # PyPy |
| 1310 os.path.join(virtualEnv, "bin", "django-admin.py"), | 1310 os.path.join(virtualEnv, "bin", "django-admin.py"), |
| 1311 ]: | 1311 ]: |
| 1312 if os.path.exists(cmd): | 1312 if os.path.exists(cmd): |
| 1313 break | 1313 break |
| 1314 else: | 1314 else: |
| 1315 cmd = "" | 1315 cmd = "" |
| 1316 else: | 1316 else: |
| 1317 cmds = [ | 1317 cmds = [ |
| 1318 os.path.join(virtualEnv, "bin", "django-admin"), | |
| 1318 os.path.join(virtualEnv, "bin", "django-admin.py"), | 1319 os.path.join(virtualEnv, "bin", "django-admin.py"), |
| 1319 os.path.join(virtualEnv, "bin", "django-admin"), | 1320 os.path.join(virtualEnv, "local", "bin", "django-admin"), |
| 1320 os.path.join(virtualEnv, "local", "bin", | 1321 os.path.join(virtualEnv, "local", "bin", |
| 1321 "django-admin.py"), | 1322 "django-admin.py"), |
| 1322 os.path.join(virtualEnv, "local", "bin", "django-admin"), | |
| 1323 ] | 1323 ] |
| 1324 for cmd in cmds: | 1324 for cmd in cmds: |
| 1325 if os.path.exists(cmd): | 1325 if os.path.exists(cmd): |
| 1326 break | 1326 break |
| 1327 else: | 1327 else: |
| 1329 else: | 1329 else: |
| 1330 if isWindowsPlatform(): | 1330 if isWindowsPlatform(): |
| 1331 debugEnv = self.__getDebugEnvironment(language) | 1331 debugEnv = self.__getDebugEnvironment(language) |
| 1332 for cmd in [ | 1332 for cmd in [ |
| 1333 # standard Python | 1333 # standard Python |
| 1334 os.path.join(debugEnv, "Scripts", "django-admin.py"), | 1334 os.path.join(debugEnv, "Scripts", "django-admin.exe"), |
| 1335 # PyPy | 1335 # PyPy |
| 1336 os.path.join(debugEnv, "bin", "django-admin.py"), | 1336 os.path.join(debugEnv, "bin", "django-admin.py"), |
| 1337 ]: | 1337 ]: |
| 1338 if os.path.exists(cmd): | 1338 if os.path.exists(cmd): |
| 1339 break | 1339 break |
| 1340 else: | 1340 else: |
| 1341 cmd = "" | 1341 cmd = "" |
| 1342 else: | 1342 else: |
| 1343 if language == "Python3": | 1343 if language == "Python3": |
| 1344 cmds = ["django-admin3.py", "django-admin3", | 1344 cmds = ["django-admin3", |
| 1345 "django-admin3.py", | |
| 1345 "django-admin.py-3.10", | 1346 "django-admin.py-3.10", |
| 1346 "django-admin.py-3.9", "django-admin.py-3.8", | 1347 "django-admin.py-3.9", |
| 1347 "django-admin.py-3.7", "django-admin.py-3.6", | 1348 "django-admin.py-3.8", |
| 1349 "django-admin.py-3.7", | |
| 1350 "django-admin.py-3.6", | |
| 1348 ] | 1351 ] |
| 1349 else: | 1352 else: |
| 1350 cmds = [] | 1353 cmds = [] |
| 1351 cmds.extend(["django-admin.py", "django-admin"]) | 1354 cmds.extend(["django-admin", "django-admin.py"]) |
| 1352 for cmd in cmds: | 1355 for cmd in cmds: |
| 1353 if Utilities.isinpath(cmd): | 1356 if Utilities.isinpath(cmd): |
| 1354 break | 1357 break |
| 1355 else: | 1358 else: |
| 1356 cmd = "" | 1359 cmd = "" |
