summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-01-24 13:41:25 -0500
committerTim Graham <timograham@gmail.com>2016-05-09 07:57:47 -0400
commitbf3057d10bc1e78a8e45142a8288a733b3e908a2 (patch)
treeee6c29361449b6dee9fdda7be81ced26d24c4bc3
parent49c57f8565d4b655de5161d299a053eddfc00bf2 (diff)
Refs #24046 -- Removed redundant condition in render_value_in_context()
Calling conditional_escape() on SafeData won't change it.
-rw-r--r--django/template/base.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/django/template/base.py b/django/template/base.py
index 99f30ff32d..c48746bbef 100644
--- a/django/template/base.py
+++ b/django/template/base.py
@@ -1012,8 +1012,7 @@ def render_value_in_context(value, context):
value = template_localtime(value, use_tz=context.use_tz)
value = localize(value, use_l10n=context.use_l10n)
value = force_text(value)
- if ((context.autoescape and not isinstance(value, SafeData)) or
- isinstance(value, EscapeData)):
+ if context.autoescape or isinstance(value, EscapeData):
return conditional_escape(value)
else:
return value