summaryrefslogtreecommitdiff
path: root/django/template
diff options
context:
space:
mode:
authorShivang Bharadwaj <reficul31@gmail.com>2016-12-29 02:33:20 +0530
committerTim Graham <timograham@gmail.com>2016-12-28 16:03:20 -0500
commit6a7495051304d75865add6ff96422018984e1663 (patch)
treeb0e74ccd6fea585afb7d15f2735dc3a80d10004d /django/template
parent4e89082f31689d05a1b3aeaabd325f1b2cdcda5b (diff)
Fixed #27258 -- Prohibited django.Template.render() with non-dict context.
Thanks Shivang Bharadwaj for the initial patch.
Diffstat (limited to 'django/template')
-rw-r--r--django/template/context.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/django/template/context.py b/django/template/context.py
index 134aac4b36..166f60fe75 100644
--- a/django/template/context.py
+++ b/django/template/context.py
@@ -281,6 +281,8 @@ def make_context(context, request=None, **kwargs):
"""
Create a suitable Context from a plain dict and optionally an HttpRequest.
"""
+ if context is not None and not isinstance(context, dict):
+ raise TypeError('context must be a dict rather than %s.' % context.__class__.__name__)
if request is None:
context = Context(context, **kwargs)
else: