summaryrefslogtreecommitdiff
path: root/django/template/context.py
diff options
context:
space:
mode:
Diffstat (limited to 'django/template/context.py')
-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: