mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-11-01 20:31:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Revert "Fixed #20296 -- Allowed SafeData and EscapeData to be lazy"

Browse source 
This reverts commit 2ee447fb5f.

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.
This commit is contained in:
Baptiste Mispelon 2014-02-05 05:16:39 +01:00
parent a0fc7fa5df
commit a878bf9b09
2 changed files with 9 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

17
tests/utils_tests/test_safestring.py
View file

@ -3,8 +3,8 @@ from __future__ 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, Promise
from django.utils.safestring import mark_safe, mark_for_escaping
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
@ -28,8 +28,8 @@ class SafeStringTest(TestCase):
s = lazystr('a&b')
b = lazybytes(b'a&b')
self.assertIsInstance(mark_safe(s), Promise)
self.assertIsInstance(mark_safe(b), Promise)
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):
@ -41,15 +41,10 @@ class SafeStringTest(TestCase):
s = lazystr('a&b')
b = lazybytes(b'a&b')
self.assertIsInstance(mark_for_escaping(s), Promise)
self.assertIsInstance(mark_for_escaping(b), Promise)
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))
def test_regression_20296(self):
s = mark_safe(translation.ugettext_lazy("username"))
with translation.override('fr'):
self.assertRenderEqual('{{ s }}', "nom d'utilisateur", s=s)
def test_html(self):
s = '<h1>interop</h1>'
self.assertEqual(s, mark_safe(s).__html__())