Ticket #1908: directory_name_fix.diff

django/core/management/commands/startapp.py

@@ -3 +3 @@
 from django.core.management.base import copy_helper, CommandError, LabelCommand
 from django.utils.importlib import import_module
 
+# to check if upper level directory is really a django project
+std_project_files = ("manage.py","urls.py")
+
 class Command(LabelCommand):
     help = "Creates a Django app directory structure for the given app name in the current directory."
     args = "[appname]"
@@ -21 +24 @@
         # which should be the full path of the project directory (or the
         # current directory if no directory was passed).
         project_name = os.path.basename(directory)
+        
         if app_name == project_name:
-            raise CommandError("You cannot create an app with the same name"
+            for filename in std_project_files:
+                if not os.path.isfile(os.path.join(project_name,filename)):
+                    break
+            else:
+                raise CommandError("You cannot create an app with the same name"
                                " (%r) as your project." % app_name)
 
         # Check that the app_name cannot be imported.