diff options
author | Tim Graham <timograham@gmail.com> | 2016-01-22 19:01:54 -0500 |
---|---|---|
committer | Tim Graham <timograham@gmail.com> | 2016-03-05 11:00:12 -0500 |
commit | c3e22ba78d1f6a780d1181cb16e3240136f2ae59 (patch) | |
tree | 9b8cb65ffc2a7a8797a294093240befd449c9aa2 /django/template/defaultfilters.py | |
parent | 9ed4a788aa8d6ba6a57a2daa15253c3047048dfb (diff) | |
download | django-c3e22ba78d1f6a780d1181cb16e3240136f2ae59.tar.gz |
Refs #24046 -- POC for mark_for_escaping() removal.24046
Diffstat (limited to 'django/template/defaultfilters.py')
-rw-r--r-- | django/template/defaultfilters.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/template/defaultfilters.py b/django/template/defaultfilters.py index a7c9b718ff..85d1aaa3c0 100644 --- a/django/template/defaultfilters.py +++ b/django/template/defaultfilters.py @@ -16,7 +16,7 @@ from django.utils.html import ( strip_tags, urlize as _urlize, ) from django.utils.http import urlquote -from django.utils.safestring import SafeData, mark_for_escaping, mark_safe +from django.utils.safestring import SafeData, mark_safe from django.utils.text import ( Truncator, normalize_newlines, phone2numeric, slugify as _slugify, wrap, ) @@ -441,7 +441,7 @@ def escape_filter(value): """ Marks the value as a string that should be auto-escaped. """ - return mark_for_escaping(value) + return conditional_escape(value) @register.filter(is_safe=True) |