diff options
Diffstat (limited to 'django/template/context.py')
| -rw-r--r-- | django/template/context.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/django/template/context.py b/django/template/context.py index 6ba53f340b..8f16a95021 100644 --- a/django/template/context.py +++ b/django/template/context.py @@ -62,6 +62,8 @@ class Context(object): def update(self, other_dict): "Like dict.update(). Pushes an entire dictionary's keys and values onto the context." + if not hasattr(other_dict, '__getitem__'): + raise TypeError('other_dict must be a mapping (dictionary-like) object.') self.dicts = [other_dict] + self.dicts return other_dict |