summaryrefslogtreecommitdiff
path: root/tests/utils_tests/test_safestring.py
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-01-22 19:01:54 -0500
committerTim Graham <timograham@gmail.com>2016-03-05 11:00:12 -0500
commitc3e22ba78d1f6a780d1181cb16e3240136f2ae59 (patch)
tree9b8cb65ffc2a7a8797a294093240befd449c9aa2 /tests/utils_tests/test_safestring.py
parent9ed4a788aa8d6ba6a57a2daa15253c3047048dfb (diff)
downloaddjango-24046.tar.gz
Refs #24046 -- POC for mark_for_escaping() removal.24046
Diffstat (limited to 'tests/utils_tests/test_safestring.py')
-rw-r--r--tests/utils_tests/test_safestring.py34
1 files changed, 1 insertions, 33 deletions
diff --git a/tests/utils_tests/test_safestring.py b/tests/utils_tests/test_safestring.py
index 7cc92a1370..2995a09552 100644
--- a/tests/utils_tests/test_safestring.py
+++ b/tests/utils_tests/test_safestring.py
@@ -5,9 +5,7 @@ from django.test import SimpleTestCase
from django.utils import html, six, text
from django.utils.encoding import force_bytes
from django.utils.functional import lazy, lazystr
-from django.utils.safestring import (
- EscapeData, SafeData, mark_for_escaping, mark_safe,
-)
+from django.utils.safestring import SafeData, mark_safe
lazybytes = lazy(force_bytes, bytes)
@@ -62,36 +60,6 @@ class SafeStringTest(SimpleTestCase):
def test_mark_safe_lazy_result_implements_dunder_html(self):
self.assertEqual(mark_safe(lazystr('a&b')).__html__(), 'a&b')
- def test_mark_for_escaping(self):
- s = mark_for_escaping('a&b')
- self.assertRenderEqual('{{ s }}', 'a&amp;b', s=s)
- self.assertRenderEqual('{{ s }}', 'a&amp;b', s=mark_for_escaping(s))
-
- def test_mark_for_escaping_object_implementing_dunder_html(self):
- e = customescape('<a&b>')
- s = mark_for_escaping(e)
- self.assertIs(s, e)
-
- self.assertRenderEqual('{{ s }}', '<<a&b>>', s=s)
- self.assertRenderEqual('{{ s|force_escape }}', '&lt;a&amp;b&gt;', s=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&amp;b', s=mark_for_escaping(s))
-
- def test_mark_for_escaping_object_implementing_dunder_str(self):
- class Obj(object):
- def __str__(self):
- return '<obj>'
-
- s = mark_for_escaping(Obj())
-
- self.assertRenderEqual('{{ s }}', '&lt;obj&gt;', s=s)
-
def test_add_lazy_safe_text_and_safe_text(self):
s = html.escape(lazystr('a'))
s += mark_safe('&b')