Ticket #18103: 18103-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/contrib/auth/tests/urls.py

@@ -18 +18 @@
 
 def auth_processor_no_attr_access(request):
     r1 = render_to_response('context_processors/auth_attrs_no_access.html',
-        RequestContext(request, {}, processors=[context_processors.auth]))
+        context_instance=RequestContext(request, {}, processors=[context_processors.auth]))
     # *After* rendering, we check whether the session was accessed
     return render_to_response('context_processors/auth_attrs_test_access.html',
         {'session_accessed':request.session.accessed})
 
 def auth_processor_attr_access(request):
     r1 = render_to_response('context_processors/auth_attrs_access.html',
-        RequestContext(request, {}, processors=[context_processors.auth]))
+        context_instance=RequestContext(request, {}, processors=[context_processors.auth]))
     return render_to_response('context_processors/auth_attrs_test_access.html',
         {'session_accessed':request.session.accessed})
 
 def auth_processor_user(request):
     return render_to_response('context_processors/auth_attrs_user.html',
-        RequestContext(request, {}, processors=[context_processors.auth]))
+        context_instance=RequestContext(request, {}, processors=[context_processors.auth]))
 
 def auth_processor_perms(request):
     return render_to_response('context_processors/auth_attrs_perms.html',
-        RequestContext(request, {}, processors=[context_processors.auth]))
+        context_instance=RequestContext(request, {}, processors=[context_processors.auth]))
 
 def auth_processor_messages(request):
     info(request, "Message 1")
     return render_to_response('context_processors/auth_attrs_messages.html',
-         RequestContext(request, {}, processors=[context_processors.auth]))
+         context_instance=RequestContext(request, {}, processors=[context_processors.auth]))
 
 def userpage(request):
     pass

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

django/template/loader.py

@@ -163 +163 @@
     the templates in the list. Returns a string.
     """
     dictionary = dictionary or {}
+    assert type(dictionary) is dict, "dictionary parameter must be a dictionary!"
     if isinstance(template_name, (list, tuple)):
         t = select_template(template_name)
     else:

tests/regressiontests/context_processors/views.py

@@ -5 +5 @@
 
 def request_processor(request):
     return render_to_response('context_processors/request_attrs.html',
-        RequestContext(request, {}, processors=[context_processors.request]))
+        context_instance=RequestContext(request, {}, processors=[context_processors.request]))

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/loaders.py

@@ -153 +153 @@
         self.assertRaisesRegexp(TemplateDoesNotExist,
                                 'No template names provided$',
                                 loader.select_template, [])
+
+    def test_bad_context_instance_position(self):
+        """ Test that an AssertionError is raised when a Context instance is
+            passed as the second argument of render_to_string
+        """
+        context = Context({'obj': 'before'})
+        with self.assertRaises(AssertionError):
+            loader.render_to_string('test_context.html', context)

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__"""