mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-01-03 06:55:47 +00:00
Code Issues 30 Releases Wiki Activity

Fixed #32734 -- Fixed validation of startapp's directory with trailing slash.

Browse Source 
Regression in fc9566d42d.
This commit is contained in:
Rohith PR 2021-05-11 16:09:28 +05:30 committed by Mariusz Felisiak
parent 29345aecf6
commit 530f58caaa
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -798,6 +798,7 @@ answer newbie questions, and generally made Django that much better:
Rob Nguyen <tienrobertnguyenn@gmail.com> Rob Nguyen <tienrobertnguyenn@gmail.com>
Robin Munn <http://www.geekforgod.com/> Robin Munn <http://www.geekforgod.com/>
Rodrigo Pinheiro Marques de Araújo <fenrrir@gmail.com> Rodrigo Pinheiro Marques de Araújo <fenrrir@gmail.com>
Rohith P R <https://rohithpr.com>
Romain Garrigues <romain.garrigues.cs@gmail.com> Romain Garrigues <romain.garrigues.cs@gmail.com>
Ronny Haryanto <https://ronny.haryan.to/> Ronny Haryanto <https://ronny.haryan.to/>
Ross Poulton <ross@rossp.org> Ross Poulton <ross@rossp.org>

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

@ -73,9 +73,9 @@ class TemplateCommand(BaseCommand):
except OSError as e: except OSError as e:
raise CommandError(e) raise CommandError(e)
else: else:
if app_or_project == 'app':
self.validate_name(os.path.basename(target), 'directory')
top_dir = os.path.abspath(os.path.expanduser(target)) top_dir = os.path.abspath(os.path.expanduser(target))
if app_or_project == 'app':
self.validate_name(os.path.basename(top_dir), 'directory')
if not os.path.exists(top_dir): if not os.path.exists(top_dir):
raise CommandError("Destination directory '%s' does not " raise CommandError("Destination directory '%s' does not "
"exist, please create it first." % top_dir) "exist, please create it first." % top_dir)

7
tests/admin_scripts/tests.py
View File

@ -2206,6 +2206,13 @@ class StartApp(AdminScriptTestCase):
"another directory." "another directory."
) )
def test_trailing_slash_in_target_app_directory_name(self):
app_dir = os.path.join(self.test_dir, 'apps', 'app1')
os.makedirs(app_dir)
_, err = self.run_django_admin(['startapp', 'app', os.path.join('apps', 'app1', '')])
self.assertNoOutput(err)
self.assertIs(os.path.exists(os.path.join(app_dir, 'apps.py')), True)
def test_overlaying_app(self): def test_overlaying_app(self):
# Use a subdirectory so it is outside the PYTHONPATH. # Use a subdirectory so it is outside the PYTHONPATH.
os.makedirs(os.path.join(self.test_dir, 'apps/app1')) os.makedirs(os.path.join(self.test_dir, 'apps/app1'))