Ticket #3475: invalid_app_and_project_names.patch

django/core/management.py

@@ -25 +25 @@
 # which has been installed.
 PROJECT_TEMPLATE_DIR = os.path.join(django.__path__[0], 'conf', '%s_template')
 
-INVALID_PROJECT_NAMES = ('django', 'site', 'test')
-
 # Set up the terminal color scheme.
 class dummy: pass
 style = dummy()
@@ -50 +48 @@
 if sys.platform == 'win32' or sys.platform == 'Pocket PC' or not sys.stdout.isatty():
     disable_termcolors()
 
+def _is_valid_project_or_app_name(name):
+    valid_name = False
+    try:
+        eval(name)
+    except NameError:
+        try:
+            __import__(name)
+        except ImportError:
+            valid_name = True
+        except:
+            pass
+    except:
+        pass
+    return valid_name
+
 def _is_valid_dir_name(s):
     return bool(re.search(r'^\w+$', s))
 
@@ -707 +720 @@
 def startproject(project_name, directory):
     "Creates a Django project for the given project_name in the given directory."
     from random import choice
-    if project_name in INVALID_PROJECT_NAMES:
-        sys.stderr.write(style.ERROR("Error: '%r' conflicts with the name of an existing Python module and cannot be used as a project name. Please try another name.\n" % project_name))
+    if not _is_valid_project_or_app_name(project_name):
+        sys.stderr.write(style.ERROR("Error: '%r' conflicts with the name of an existing Python module or keyword and cannot be used as a project name. Please try another name.\n" % project_name))
         sys.exit(1)
     _start_helper('project', project_name, directory)
     # Create a random SECRET_KEY hash, and put it in the main settings.
@@ -726 +739 @@
     "Creates a Django app for the given app_name in the given directory."
     # Determine the project_name a bit naively -- by looking at the name of
     # the parent directory.
+    if not _is_valid_project_or_app_name(app_name):
+        sys.stderr.write(style.ERROR("Error: '%r' conflicts with the name of an existing Python module or keyword and cannot be used as a application name. Please try another name.\n" % app_name))
+        sys.exit(1)
     project_dir = os.path.normpath(os.path.join(directory, '..'))
     project_name = os.path.basename(project_dir)
     if app_name == os.path.basename(directory):