p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Ramiro Morales 2011-12-29 19:06:57 +00:00
parent f185024fc4
commit a82204fa9a
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
django/core/management/templates.py
View File

@ -60,6 +60,17 @@ class TemplateCommand(BaseCommand):
self.paths_to_remove = [] self.paths_to_remove = []
self.verbosity = int(options.get('verbosity')) 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 some directory is given, make sure it's nicely expanded
if target is None: if target is None:
target = os.getcwd() target = os.getcwd()
@ -88,17 +99,6 @@ class TemplateCommand(BaseCommand):
base_directory: top_dir, 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 # Setup a stub settings environment for template rendering
from django.conf import settings from django.conf import settings
if not settings.configured: if not settings.configured:

14
tests/regressiontests/admin_scripts/tests.py
View File

@ -1386,6 +1386,20 @@ class StartProject(LiveServerTestCase, AdminScriptTestCase):
self.assertNoOutput(out) self.assertNoOutput(out)
self.assertOutput(err, "File exists") 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): def test_simple_project_different_directory(self):
"Make sure the startproject management command creates a project in a specific directory" "Make sure the startproject management command creates a project in a specific directory"
args = ['startproject', 'testproject', 'othertestproject'] args = ['startproject', 'testproject', 'othertestproject']