Ticket #6654: startproject.patch

django/core/management/commands/startproject.py

@@ -3 +3 @@
 import re
 from random import choice
 
-INVALID_PROJECT_NAMES = ('django', 'site', 'test')
-
 class Command(LabelCommand):
     help = "Creates a Django project directory structure for the given project name in the current directory."
     args = "[projectname]"
@@ -20 +18 @@
         # the parent directory.
         directory = os.getcwd()
 
-        if project_name in INVALID_PROJECT_NAMES:
-            raise CommandError("%r conflicts with the name of an existing Python module and cannot be used as a project name. Please try another name." % project_name)
+        # Check that the project_name is free and can't be imported
+        try:
+            __import__(project_name)
+        except:
+            pass
+        else:
+            raise CommandError("%r conflicts with the name of an existing "
+                "Python module and cannot be used as a project name. "
+                "Please try another name." % project_name)
 
         copy_helper(self.style, 'project', project_name, directory)