mirror of
https://github.com/django/django.git
synced 2025-03-13 10:50:55 +00:00
8864d24789
This reverts commit 2ee447fb5f8974b432d3dd421af9a242215aea44. That commit introduced a regression (#21882) and didn't really do what it was supposed to: while it did delay the evaluation of lazy objects passed to mark_safe(), they weren't actually marked as such so they could end up being escaped twice. Refs #21882. Backport of a878bf9b093bf15d751b070d132fec52a7523a47 from master.
48 lines
1.7 KiB
Python
48 lines
1.7 KiB
Python
from __future__ import absolute_import, unicode_literals
|
|
|
|
|
|
from django.template import Template, Context
|
|
from django.test import TestCase
|
|
from django.utils.encoding import force_text, force_bytes
|
|
from django.utils.functional import lazy
|
|
from django.utils.safestring import mark_safe, mark_for_escaping, SafeData, EscapeData
|
|
from django.utils import six
|
|
from django.utils import translation
|
|
|
|
lazystr = lazy(force_text, six.text_type)
|
|
lazybytes = lazy(force_bytes, bytes)
|
|
|
|
|
|
class SafeStringTest(TestCase):
|
|
def assertRenderEqual(self, tpl, expected, **context):
|
|
context = Context(context)
|
|
tpl = Template(tpl)
|
|
self.assertEqual(tpl.render(context), expected)
|
|
|
|
def test_mark_safe(self):
|
|
s = mark_safe('a&b')
|
|
|
|
self.assertRenderEqual('{{ s }}', 'a&b', s=s)
|
|
self.assertRenderEqual('{{ s|force_escape }}', 'a&b', s=s)
|
|
|
|
def test_mark_safe_lazy(self):
|
|
s = lazystr('a&b')
|
|
b = lazybytes(b'a&b')
|
|
|
|
self.assertIsInstance(mark_safe(s), SafeData)
|
|
self.assertIsInstance(mark_safe(b), SafeData)
|
|
self.assertRenderEqual('{{ s }}', 'a&b', s=mark_safe(s))
|
|
|
|
def test_mark_for_escaping(self):
|
|
s = mark_for_escaping('a&b')
|
|
self.assertRenderEqual('{{ s }}', 'a&b', s=s)
|
|
self.assertRenderEqual('{{ s }}', 'a&b', s=mark_for_escaping(s))
|
|
|
|
def test_mark_for_escaping_lazy(self):
|
|
s = lazystr('a&b')
|
|
b = lazybytes(b'a&b')
|
|
|
|
self.assertIsInstance(mark_for_escaping(s), EscapeData)
|
|
self.assertIsInstance(mark_for_escaping(b), EscapeData)
|
|
self.assertRenderEqual('{% autoescape off %}{{ s }}{% endautoescape %}', 'a&b', s=mark_for_escaping(s))
|