diff options
| author | Rob Hudson | 2010-11-08 15:41:25 -0800 |
|---|---|---|
| committer | Rob Hudson | 2010-11-08 15:41:25 -0800 |
| commit | 8cb8abae8cec44909947dbe54e1ed644deeecbd6 (patch) | |
| tree | 4b5ed43a7a262b9e5f7434a26ee3c5e453941692 /debug_toolbar/panels | |
| parent | ee1811238e91ae0ad33413b0d40d2f8482101951 (diff) | |
| parent | ecfff96d5894aa9ad505149b9c26c9647d5af4e0 (diff) | |
| download | django-debug-toolbar-8cb8abae8cec44909947dbe54e1ed644deeecbd6.tar.bz2 | |
Merge branch 'release/0.8.4'0.8.4
Diffstat (limited to 'debug_toolbar/panels')
| -rw-r--r-- | debug_toolbar/panels/template.py | 13 |
1 files changed, 10 insertions, 3 deletions
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='<Unknown Template>'): |