Mercurial Repositories > Django Project / file diff

--- a/ProjectDjango/Project.py	Thu Feb 13 19:52:56 2014 +0100
+++ b/ProjectDjango/Project.py	Thu Feb 13 20:05:54 2014 +0100
@@ -1122,6 +1122,9 @@
             command for (string, one of '', 'Python2' or 'Python3')
         @return full django-admin.py command (string)
         """
+        if not language:
+            language = self.__e5project.getProjectLanguage()
+        
         virtualEnv = self.__getVirtualEnvironment(language)
         if virtualEnv:
             if isWindowsPlatform():
@@ -1144,13 +1147,18 @@
                 debugEnv = self.__getDebugEnvironment(language)
                 cmd = os.path.join(debugEnv, "Scripts", "django-admin.py")
             else:
-                if Utilities.isinpath("django-admin.py"):
-                    cmd = "django-admin.py"
-                elif Utilities.isinpath("django-admin"):
-                    cmd = "django-admin"
+                if language == "Python2":
+                    cmds = ["django-admin2.py", "django-admin2"]
+                elif language == "Python3":
+                    cmds = ["django-admin3.py", "django-admin3"]
                 else:
-                    # fall back
-                    cmd = "django-admin.py"
+                    cmds = []
+                cmds.extend(["django-admin.py", "django-admin"])
+                for cmd in cmds:
+                    if Utilities.isinpath(cmd):
+                        break
+                else:
+                    cmd = ""
         
         return cmd