mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-23 21:59:11 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #20296 -- Prevented mark_safe() from evaluating lazy objects.

Browse Source
This commit is contained in:
Theo Alexiou
2022-02-18 20:27:05 +01:00
committed by Mariusz Felisiak
parent b626c5a979
commit 659d2421c7
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/utils_tests/test_safestring.py
View File

@@ -1,8 +1,9 @@
from django.template import Context, Template
from django.test import SimpleTestCase
from django.utils import html
from django.utils.functional import lazy, lazystr
from django.utils import html, translation
from django.utils.functional import Promise, lazy, lazystr
from django.utils.safestring import SafeData, SafeString, mark_safe
from django.utils.translation import gettext_lazy
class customescape(str):
@@ -40,10 +41,17 @@ class SafeStringTest(SimpleTestCase):
self.assertRenderEqual("{{ s|force_escape }}", "<a&b>", s=s)
def test_mark_safe_lazy(self):
s = lazystr("a&b")
safe_s = mark_safe(lazystr("a&b"))
self.assertIsInstance(mark_safe(s), SafeData)
self.assertRenderEqual("{{ s }}", "a&b", s=mark_safe(s))
self.assertIsInstance(safe_s, Promise)
self.assertRenderEqual("{{ s }}", "a&b", s=safe_s)
self.assertIsInstance(str(safe_s), SafeData)
def test_mark_safe_lazy_i18n(self):
s = mark_safe(gettext_lazy("name"))
tpl = Template("{{ s }}")
with translation.override("fr"):
self.assertEqual(tpl.render(Context({"s": s})), "nom")
def test_mark_safe_object_implementing_dunder_str(self):
class Obj: