mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #24765 -- Allowed template context updates to flatten a Context.

Browse Source
This commit is contained in:
Buddy Lindsey, Jr
2015-09-10 15:54:19 -05:00
committed by Tim Graham
parent e7e8d30cae
commit ec704371e3
2 changed files with 63 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
django/template/context.py
View File

@@ -52,7 +52,13 @@ class BaseContext(object):
yield d
def push(self, *args, **kwargs):
return ContextDict(self, *args, **kwargs)
dicts = []
for d in args:
if isinstance(d, BaseContext):
dicts += d.dicts[1:]
else:
dicts.append(d)
return ContextDict(self, *dicts, **kwargs)
def pop(self):
if len(self.dicts) == 1:
@@ -175,6 +181,8 @@ class Context(BaseContext):
"Pushes other_dict to the stack of dictionaries in the Context"
if not hasattr(other_dict, '__getitem__'):
raise TypeError('other_dict must be a mapping (dictionary-like) object.')
if isinstance(other_dict, BaseContext):
other_dict = other_dict.dicts[1:].pop()
return ContextDict(self, other_dict)