From a82204fa9a5c9262252cb038628ce49477e0f7cf Mon Sep 17 00:00:00 2001
From: Ramiro Morales <cramm0@gmail.com>
Date: Thu, 29 Dec 2011 19:06:57 +0000
Subject: [PATCH] Moved validation of project names to an earlier spot so no
 directory with invalid name is created.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17288 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/core/management/templates.py          | 22 ++++++++++----------
 tests/regressiontests/admin_scripts/tests.py | 14 +++++++++++++
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/django/core/management/templates.py b/django/core/management/templates.py
index 307841522ec..cfef06b8134 100644
--- a/django/core/management/templates.py
+++ b/django/core/management/templates.py
@@ -60,6 +60,17 @@ class TemplateCommand(BaseCommand):
         self.paths_to_remove = []
         self.verbosity = int(options.get('verbosity'))
 
+        # If it's not a valid directory name.
+        if not re.search(r'^[_a-zA-Z]\w*$', name):
+            # Provide a smart error message, depending on the error.
+            if not re.search(r'^[_a-zA-Z]', name):
+                message = ('make sure the name begins '
+                           'with a letter or underscore')
+            else:
+                message = 'use only numbers, letters and underscores'
+            raise CommandError("%r is not a valid %s name. Please %s." %
+                               (name, app_or_project, message))
+
         # if some directory is given, make sure it's nicely expanded
         if target is None:
             target = os.getcwd()
@@ -88,17 +99,6 @@ class TemplateCommand(BaseCommand):
             base_directory: top_dir,
         }))
 
-        # If it's not a valid directory name.
-        if not re.search(r'^[_a-zA-Z]\w*$', name):
-            # Provide a smart error message, depending on the error.
-            if not re.search(r'^[_a-zA-Z]', name):
-                message = ('make sure the name begins '
-                           'with a letter or underscore')
-            else:
-                message = 'use only numbers, letters and underscores'
-            raise CommandError("%r is not a valid %s name. Please %s." %
-                               (name, app_or_project, message))
-
         # Setup a stub settings environment for template rendering
         from django.conf import settings
         if not settings.configured:
diff --git a/tests/regressiontests/admin_scripts/tests.py b/tests/regressiontests/admin_scripts/tests.py
index d33cfee83b8..8d820f6dca1 100644
--- a/tests/regressiontests/admin_scripts/tests.py
+++ b/tests/regressiontests/admin_scripts/tests.py
@@ -1386,6 +1386,20 @@ class StartProject(LiveServerTestCase, AdminScriptTestCase):
         self.assertNoOutput(out)
         self.assertOutput(err, "File exists")
 
+    def test_invalid_project_name(self):
+        def cleanup(p):
+            if os.path.exists(p):
+                shutil.rmtree(p)
+
+        "Make sure the startproject management command validates a project name"
+        args = ['startproject', '7testproject']
+        testproject_dir = os.path.join(test_dir, '7testproject')
+
+        out, err = self.run_django_admin(args)
+        self.addCleanup(cleanup, testproject_dir)
+        self.assertOutput(err, "Error: '7testproject' is not a valid project name. Please make sure the name begins with a letter or underscore.")
+        self.assertFalse(os.path.exists(testproject_dir))
+
     def test_simple_project_different_directory(self):
         "Make sure the startproject management command creates a project in a specific directory"
         args = ['startproject', 'testproject', 'othertestproject']