diff options
| author | Arthur Jovart <arthur@jovart.com> | 2021-04-14 14:50:01 +0200 |
|---|---|---|
| committer | Carlton Gibson <carlton.gibson@noumenal.es> | 2021-04-14 16:50:47 +0200 |
| commit | 08c60cce3b13f6e60d7588206da2d3c71228f378 (patch) | |
| tree | 9fdfa5be28b19f45f9c5771dd5baac3384976cb6 | |
| parent | 23fa29f6a6659e0f600d216de6bcb79e7f6818c9 (diff) | |
Fixed #32648 -- Fixed VariableDoesNotExist rendering sitemaps template.
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | django/contrib/sitemaps/__init__.py | 7 | ||||
| -rw-r--r-- | docs/releases/3.2.1.txt | 3 | ||||
| -rw-r--r-- | tests/sitemaps_tests/test_http.py | 6 |
4 files changed, 11 insertions, 6 deletions
@@ -94,6 +94,7 @@ answer newbie questions, and generally made Django that much better: Aron Podrigal <aronp@guaranteedplus.com> Artem Gnilov <boobsd@gmail.com> Arthur <avandorp@gmail.com> + Arthur Jovart <arthur@jovart.com> Arthur Koziel <http://arthurkoziel.com> Arthur Rio <arthur.rio44@gmail.com> Arvis Bickovskis <viestards.lists@gmail.com> diff --git a/django/contrib/sitemaps/__init__.py b/django/contrib/sitemaps/__init__.py index b13507a11e..46a54ec8f2 100644 --- a/django/contrib/sitemaps/__init__.py +++ b/django/contrib/sitemaps/__init__.py @@ -168,13 +168,13 @@ class Sitemap: 'lastmod': lastmod, 'changefreq': self._get('changefreq', item), 'priority': str(priority if priority is not None else ''), + 'alternates': [], } if self.i18n and self.alternates: - alternates = [] for lang_code in self._languages(): loc = f'{protocol}://{domain}{self._location(item, lang_code)}' - alternates.append({ + url_info['alternates'].append({ 'location': loc, 'lang_code': lang_code, }) @@ -182,11 +182,10 @@ class Sitemap: lang_code = settings.LANGUAGE_CODE loc = f'{protocol}://{domain}{self._location(item, lang_code)}' loc = loc.replace(f'/{lang_code}/', '/', 1) - alternates.append({ + url_info['alternates'].append({ 'location': loc, 'lang_code': 'x-default', }) - url_info['alternates'] = alternates urls.append(url_info) diff --git a/docs/releases/3.2.1.txt b/docs/releases/3.2.1.txt index d5486f4cc9..4ad9eff5ca 100644 --- a/docs/releases/3.2.1.txt +++ b/docs/releases/3.2.1.txt @@ -30,3 +30,6 @@ Bugfixes * Fixed a regression in Django 3.2 that caused a crash of :attr:`.ModelAdmin.search_fields` when searching against phrases with unbalanced quotes (:ticket:`32649`). + +* Fixed a bug in Django 3.2 where variable lookup errors were logged rendering + the sitemap template if alternates were not defined (:ticket:`32648`). diff --git a/tests/sitemaps_tests/test_http.py b/tests/sitemaps_tests/test_http.py index b546c87fe6..fadf88eb60 100644 --- a/tests/sitemaps_tests/test_http.py +++ b/tests/sitemaps_tests/test_http.py @@ -255,9 +255,11 @@ class HTTPSitemapTests(SitemapTestsBase): @override_settings(LANGUAGES=(('en', 'English'), ('pt', 'Portuguese'))) def test_simple_i18n_sitemap_index(self): """ - A simple i18n sitemap index can be rendered. + A simple i18n sitemap index can be rendered, without logging variable + lookup errors. """ - response = self.client.get('/simple/i18n.xml') + with self.assertNoLogs('django.template', 'DEBUG'): + response = self.client.get('/simple/i18n.xml') expected_content = """<?xml version="1.0" encoding="UTF-8"?> <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml"> <url><loc>{0}/en/i18n/testmodel/{1}/</loc><changefreq>never</changefreq><priority>0.5</priority></url><url><loc>{0}/pt/i18n/testmodel/{1}/</loc><changefreq>never</changefreq><priority>0.5</priority></url> |