Fixed #6789 -- Added some small amount of extra protection for learners trying

to pick a name for their project. Thanks, thejaswi_puthraya.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7320 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 7 insertions, 2 deletions

diff --git a/django/core/management/commands/startproject.py b/django/core/management/commands/startproject.py
index ab4f409f15..867d4fd3da 100644
--- a/django/core/management/commands/startproject.py
+++ b/django/core/management/commands/startproject.py
@@ -20,8 +20,13 @@ class Command(LabelCommand):
         # 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)
+        try:
+            proj_name = __import__(project_name)
+            if proj_name:
+                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)
+        except ImportError:
+            if project_name in INVALID_PROJECT_NAMES:
+                raise CommandError("%r contains an invalid project name. Please try another name." % project_name)
 
         copy_helper(self.style, 'project', project_name, directory)