From 2519b2cc5cda4b462de108cac1d9dd2fae2e9dd4 Mon Sep 17 00:00:00 2001 From: bkonkle Date: Mon, 12 Sep 2011 12:12:58 -0500 Subject: Updated the signals panel --- debug_toolbar/panels/signals.py | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'debug_toolbar/panels/signals.py') diff --git a/debug_toolbar/panels/signals.py b/debug_toolbar/panels/signals.py index dbd3725..9855299 100644 --- a/debug_toolbar/panels/signals.py +++ b/debug_toolbar/panels/signals.py @@ -14,12 +14,13 @@ try: except ImportError: connection_created = None +from debug_toolbar.middleware import DebugToolbarMiddleware from debug_toolbar.panels import DebugPanel class SignalDebugPanel(DebugPanel): name = "Signals" has_content = True - + SIGNALS = { 'request_started': request_started, 'request_finished': request_finished, @@ -34,16 +35,16 @@ class SignalDebugPanel(DebugPanel): 'post_delete': post_delete, 'post_syncdb': post_syncdb, } - + def nav_title(self): return _("Signals") - + def title(self): return _("Signals") - + def url(self): return '' - + def signals(self): signals = self.SIGNALS.copy() if hasattr(settings, 'DEBUG_TOOLBAR_CONFIG'): @@ -57,8 +58,8 @@ class SignalDebugPanel(DebugPanel): signals[parts[-1]] = getattr(sys.modules[path], parts[-1]) return signals signals = property(signals) - - def content(self): + + def process_response(self, request, response): signals = [] keys = self.signals.keys() keys.sort() @@ -80,8 +81,12 @@ class SignalDebugPanel(DebugPanel): text = "function %s" % receiver.__name__ receivers.append(text) signals.append((name, signal, receivers)) - + + self.stats = {'signals': signals} + toolbar = DebugToolbarMiddleware.get_current() + toolbar.stats['signals'] = self.stats + + def content(self): context = self.context.copy() - context.update({'signals': signals}) - + context.update(self.stats) return render_to_string('debug_toolbar/panels/signals.html', context) -- cgit v1.2.3 From 717dc6815a9d4ddcd30efc17db11ade0f8f38354 Mon Sep 17 00:00:00 2001 From: bkonkle Date: Thu, 15 Sep 2011 10:36:11 -0500 Subject: Edited all of the panels to use the stats API and not override the content method --- debug_toolbar/panels/signals.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'debug_toolbar/panels/signals.py') diff --git a/debug_toolbar/panels/signals.py b/debug_toolbar/panels/signals.py index 9855299..205b3c5 100644 --- a/debug_toolbar/panels/signals.py +++ b/debug_toolbar/panels/signals.py @@ -6,7 +6,6 @@ from django.core.signals import request_started, request_finished, \ from django.db.models.signals import class_prepared, pre_init, post_init, \ pre_save, post_save, pre_delete, post_delete, post_syncdb from django.dispatch.dispatcher import WEAKREF_TYPES -from django.template.loader import render_to_string from django.utils.translation import ugettext_lazy as _ try: @@ -14,11 +13,11 @@ try: except ImportError: connection_created = None -from debug_toolbar.middleware import DebugToolbarMiddleware from debug_toolbar.panels import DebugPanel class SignalDebugPanel(DebugPanel): name = "Signals" + template = 'debug_toolbar/panels/signals.html' has_content = True SIGNALS = { @@ -82,11 +81,4 @@ class SignalDebugPanel(DebugPanel): receivers.append(text) signals.append((name, signal, receivers)) - self.stats = {'signals': signals} - toolbar = DebugToolbarMiddleware.get_current() - toolbar.stats['signals'] = self.stats - - def content(self): - context = self.context.copy() - context.update(self.stats) - return render_to_string('debug_toolbar/panels/signals.html', context) + self.record_stats({'signals': signals}) -- cgit v1.2.3