From 0a62cc02b621a08d2a5d19261ef64e31a5065214 Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Tue, 7 Sep 2010 15:42:18 -0700 Subject: Fixed template block inheritance bug (issues 77 and 97) --- debug_toolbar/panels/template.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'debug_toolbar/panels/template.py') diff --git a/debug_toolbar/panels/template.py b/debug_toolbar/panels/template.py index fe34729..d9cd071 100644 --- a/debug_toolbar/panels/template.py +++ b/debug_toolbar/panels/template.py @@ -19,9 +19,16 @@ from debug_toolbar.panels import DebugPanel # e-mail interception, which we don't want from django.test.utils import instrumented_test_render from django.template import Template -if Template.render != instrumented_test_render: - Template.original_render = Template.render - Template.render = instrumented_test_render + +if not hasattr(Template, '_render'): # Django < 1.2 + if Template.render != instrumented_test_render: + Template.original_render = Template.render + Template.render = instrumented_test_render +else: + if Template._render != instrumented_test_render: + Template.original_render = Template._render + Template._render = instrumented_test_render + # MONSTER monkey-patch old_template_init = Template.__init__ def new_template_init(self, template_string, origin=None, name=''): -- cgit v1.2.3