Ticket #6509: 6509.diff

django/core/management/commands/startapp.py

@@ -23 +23 @@
         if app_name == project_name:
             raise CommandError("You cannot create an app with the same name"
                                " (%r) as your project." % app_name)
+        try:
+            module = __import__(app_name)
+            if module:
+                raise CommandError("%r conflicts with the name of an existing Python module and cannot be used as a application name. Please try another name." % app_name)
+        except ImportError:
+            pass
+
         copy_helper(self.style, 'app', app_name, directory, project_name)
 
 class ProjectCommand(Command):