Skip to content

Commit

Permalink
[3.2.x] Fixed #32744 -- Normalized to pathlib.Path in autoreloader ch…
Browse files Browse the repository at this point in the history
…eck for template changes.

Backport of 68357b2 from main
  • Loading branch information
hramezani authored and carltongibson committed May 26, 2021
1 parent 143d2a4 commit c0d506f
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 2 deletions.
7 changes: 5 additions & 2 deletions django/template/autoreload.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
from pathlib import Path

from django.dispatch import receiver
from django.template import engines
from django.template.backends.django import DjangoTemplates
from django.utils._os import to_path
from django.utils.autoreload import (
autoreload_started, file_changed, is_django_path,
)
Expand All @@ -15,13 +18,13 @@ def get_template_directories():
if not isinstance(backend, DjangoTemplates):
continue

items.update(backend.engine.dirs)
items.update(Path.cwd() / to_path(dir) for dir in backend.engine.dirs)

for loader in backend.engine.template_loaders:
if not hasattr(loader, 'get_dirs'):
continue
items.update(
directory
Path.cwd() / to_path(directory)
for directory in loader.get_dirs()
if not is_django_path(directory)
)
Expand Down
3 changes: 3 additions & 0 deletions docs/releases/3.2.4.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@ Bugfixes
* Fixed a crash in Django 3.2 that could occur when running ``mod_wsgi`` with
the recommended settings while the Windows ``colorama`` library was installed
(:ticket:`32740`).

* Fixed a bug in Django 3.2 that would trigger the auto-reloader for template
changes when directory paths were specified with strings (:ticket:`32744`).
20 changes: 20 additions & 0 deletions tests/template_tests/test_autoreloader.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,26 @@ def test_reset_all_loaders(self, mock_reset):
autoreload.reset_loaders()
self.assertEqual(mock_reset.call_count, 2)

@override_settings(
TEMPLATES=[{
'DIRS': [
str(ROOT) + '/absolute_str',
'template_tests/relative_str',
Path('template_tests/relative_path'),
],
'BACKEND': 'django.template.backends.django.DjangoTemplates',
}]
)
def test_template_dirs_normalized_to_paths(self):
self.assertSetEqual(
autoreload.get_template_directories(),
{
ROOT / 'absolute_str',
Path.cwd() / 'template_tests/relative_str',
Path.cwd() / 'template_tests/relative_path',
}
)


@require_jinja2
@override_settings(INSTALLED_APPS=['template_tests'])
Expand Down

0 comments on commit c0d506f

Please sign in to comment.