From 0505000533c7a92a970f1dddbc45813d8826e292 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Wed, 21 Sep 2005 18:18:04 +0000 Subject: [PATCH] Changed django.core.extensions.load_and_render to take context_instance instead of context_class keyword arg, so DjangoContext can be used git-svn-id: http://code.djangoproject.com/svn/django/trunk@656 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/core/extensions.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/django/core/extensions.py b/django/core/extensions.py index 453d48e8a3..fce9011fc0 100644 --- a/django/core/extensions.py +++ b/django/core/extensions.py @@ -5,11 +5,13 @@ from django.core.template import Context from django.conf.settings import DEBUG, INTERNAL_IPS from django.utils.httpwrappers import HttpResponse -def load_and_render(template_name, dictionary=None, context_class=None): +def load_and_render(template_name, dictionary=None, context_instance=None): dictionary = dictionary or {} - context_class = context_class or Context t = template_loader.get_template(template_name) - c = context_class(dictionary) + if context_instance: + c = context_instance.update(dictionary) + else: + c = Context(dictionary) return HttpResponse(t.render(c)) class DjangoContext(Context):