aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAymeric Augustin2014-01-26 20:26:36 +0100
committerAymeric Augustin2014-01-26 20:26:36 +0100
commit788f323952a6500669aea13a14cff51ba0579dde (patch)
tree5892f2238c339cfb47d6a985121d9da436b42582
parent6c864231ab3bd61e7498624356619092647dcf98 (diff)
downloaddjango-debug-toolbar-788f323952a6500669aea13a14cff51ba0579dde.tar.bz2
Account for the signal changes in Django 1.7.
-rw-r--r--debug_toolbar/panels/signals.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/debug_toolbar/panels/signals.py b/debug_toolbar/panels/signals.py
index 574c118..a2003ef 100644
--- a/debug_toolbar/panels/signals.py
+++ b/debug_toolbar/panels/signals.py
@@ -6,7 +6,11 @@ from django.db.backends.signals import connection_created
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
+try:
+ from django.dispatch.dispatcher import WEAKREF_TYPES
+except ImportError:
+ import weakref
+ WEAKREF_TYPES = weakref.ReferenceType,
from django.utils.translation import ugettext_lazy as _, ungettext
from django.utils.importlib import import_module
@@ -63,7 +67,8 @@ class SignalsPanel(Panel):
if signal is None:
continue
receivers = []
- for (receiverkey, r_senderkey), receiver in signal.receivers:
+ for receiver in signal.receivers:
+ receiver = receiver[1]
if isinstance(receiver, WEAKREF_TYPES):
receiver = receiver()
if receiver is None: