Ticket #18105: 18105-2.diff

django/contrib/admin/templatetags/admin_modify.py

@@ -16 +16 @@
             for inline_admin_form in inline_admin_formset:
                 if inline_admin_form.original is None:
                     prepopulated_fields.extend(inline_admin_form.prepopulated_fields)
-    context.update({'prepopulated_fields': prepopulated_fields})
-    return context
+    return {'prepopulated_fields': prepopulated_fields}
 
 @register.inclusion_tag('admin/submit_line.html', takes_context=True)
 def submit_row(context):

django/template/base.py

@@ -5 +5 @@
 from inspect import getargspec
 
 from django.conf import settings
-from django.template.context import (Context, RequestContext,
+from django.template.context import (BaseContext, Context, RequestContext,
     ContextPopException)
 from django.utils.importlib import import_module
 from django.utils.itercompat import is_iterable
@@ -1186 +1186 @@
                         else:
                             t = get_template(file_name)
                         self.nodelist = t.nodelist
-                    new_context = context_class(_dict, **{
+                    context_vars = {
                         'autoescape': context.autoescape,
                         'current_app': context.current_app,
                         'use_l10n': context.use_l10n,
                         'use_tz': context.use_tz,
-                    })
+                    }
+                    if isinstance(_dict, BaseContext):
+                        new_context = _dict
+                        new_context.update(context_vars)
+                    else:
+                        new_context = context_class(_dict, **context_vars)
                     # Copy across the CSRF token, if present, because
                     # inclusion tags are often used for forms, and we need
                     # instructions for using CSRF protection to be as simple

tests/regressiontests/templates/custom.py

@@ -181 +181 @@
             "'inclusion_unlimited_args_kwargs' received multiple values for keyword argument 'eggs'",
             template.Template, '{% load custom %}{% inclusion_unlimited_args_kwargs 37 eggs="scrambled" eggs="scrambled" %}')
 
+        t = template.Template('{% load custom %}{% inclusion_tag_returns_context %}')
+        self.assertEqual(t.render(c), u'inclusion_returning_context\n')
+
     def test_include_tag_missing_context(self):
         # The 'context' parameter must be present when takes_context is True
         self.assertRaisesRegexp(template.TemplateSyntaxError,

tests/regressiontests/templates/templatetags/custom.py

@@ -233 +233 @@
     return {}
 inclusion_tag_without_context_parameter.anything = "Expected inclusion_tag_without_context_parameter __dict__"
 
+@register.inclusion_tag('inclusion.html', takes_context=True)
+def inclusion_tag_returns_context(context):
+    context.update({"result": "inclusion_returning_context"})
+    return context
+
 @register.assignment_tag
 def assignment_no_params():
     """Expected assignment_no_params __doc__"""