mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-04-06 06:26:41 +00:00
Code Issues 32 Releases Wiki Activity

[4.1.x] Fixed #34085 -- Made management commands don't use black for non-Python files.

Browse Source 
Bug in d113b5a837f726d1c638d76c4e88445e6cd59fd5.

Co-authored-by: programmylife <acmshar@gmail.com>
Co-authored-by: Carlton Gibson <carlton.gibson@noumenal.es>

Backport of 5c2c7277d4554db34c585477b269bb1acfcbbe56 from main.
This commit is contained in:
Carlton Gibson 2022-10-18 10:30:35 -07:00 committed by Mariusz Felisiak
parent 202f5ae96a
commit 84814412a0
4 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,7 +80,6 @@ class TemplateCommand(BaseCommand):
)
def handle(self, app_or_project, name, target=None, **options):
self.written_files = []
self.app_or_project = app_or_project
self.a_or_an = "an" if app_or_project == "app" else "a"
self.paths_to_remove = []
@ -201,7 +200,6 @@ class TemplateCommand(BaseCommand):
else:
shutil.copyfile(old_path, new_path)
self.written_files.append(new_path)
if self.verbosity >= 2:
self.stdout.write("Creating %s" % new_path)
try:
@ -224,7 +222,7 @@ class TemplateCommand(BaseCommand):
else:
shutil.rmtree(path_to_remove)
run_formatters(self.written_files)
run_formatters([top_dir])
def handle_template(self, template, subdir):
"""

4
docs/releases/4.1.3.txt
View File

@ -9,4 +9,6 @@ Django 4.1.3 fixes several bugs in 4.1.2.
Bugfixes
========
* ...
* Fixed a bug in Django 4.1 that caused non-Python files created by
``startproject`` and ``startapp`` management commands from custom templates
to be incorrectly formatted using the ``black`` command (:ticket:`34085`).

5
tests/admin_scripts/custom_templates/project_template/additional_dir/requirements.in Normal file
View File

@ -0,0 +1,5 @@
# Should not be processed by `black`.
Django<4.2
environs[django]
psycopg2-binary
django-extensions

17
tests/admin_scripts/tests.py
View File

@ -2468,6 +2468,23 @@ class StartProject(LiveServerTestCase, AdminScriptTestCase):
self.assertTrue(os.path.isdir(testproject_dir))
self.assertTrue(os.path.exists(os.path.join(testproject_dir, "additional_dir")))
def test_custom_project_template_non_python_files_not_formatted(self):
template_path = os.path.join(custom_templates_dir, "project_template")
args = ["startproject", "--template", template_path, "customtestproject"]
testproject_dir = os.path.join(self.test_dir, "customtestproject")
_, err = self.run_django_admin(args)
self.assertNoOutput(err)
with open(
os.path.join(template_path, "additional_dir", "requirements.in")
) as f:
expected = f.read()
with open(
os.path.join(testproject_dir, "additional_dir", "requirements.in")
) as f:
result = f.read()
self.assertEqual(expected, result)
def test_template_dir_with_trailing_slash(self):
"Ticket 17475: Template dir passed has a trailing path separator"
template_path = os.path.join(custom_templates_dir, "project_template" + os.sep)