Ticket #4521: signal-class.patch

django/db/models/signals.py

@@ -1 @@
-class_prepared = object()
-
-pre_init= object()
-post_init = object()
-
-pre_save = object()
-post_save = object()
-
-pre_delete = object()
-post_delete = object()
-
-post_syncdb = object()
+from django.dispatch import signal
+
+class_prepared = signal("class_prepared")
+
+pre_init= signal('pre_init')
+post_init = signal('post_init')
+
+pre_save = signal('pre_save')
+post_save = signal('post_save')
+
+pre_delete = signal('pre_delete')
+post_delete = signal('post_delete')
+
+post_syncdb = signal('post_syncdb')

django/dispatch/__init__.py

@@ -4 +4 @@
 __author__ = "Patrick K. O'Brien"
 __license__ = "BSD-style, see license.txt for details"
 
+class _signal(object):
+    def __init__(self, label):
+        self.label = label
+
+    def __str__(self):
+        return self.label
+
+    def __repr__(self):
+        return "<signal signal=%r @#%x>" % (self.label, id(self))
+
+def signal(signal_name, docstring=None):
+    if docstring is None:
+        return _signal(signal_name)
+    class signal(_signal):
+        __doc__ = docstring
+    return signal(signal_name)

django/dispatch/dispatcher.py

@@ -26 +26 @@
         vs. the original code.)
 """
 import types, weakref
-from django.dispatch import saferef, robustapply, errors
+from django.dispatch import saferef, robustapply, errors, signal
 
 __author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
 __cvsid__ = "$Id: dispatcher.py,v 1.9 2005/09/17 04:55:57 mcfletch Exp $"
 __version__ = "$Revision: 1.9 $"[11:-2]
 
-
-class _Parameter:
-    """Used to represent default parameter values."""
-    def __repr__(self):
-        return self.__class__.__name__
-
-class _Any(_Parameter):
+Any = signal('Any', 
     """Singleton used to signal either "Any Sender" or "Any Signal"
 
     The Any object can be used with connect, disconnect,
     send, or sendExact to signal that the parameter given
     Any should react to all senders/signals, not just
     a particular sender/signal.
-    """
-Any = _Any()
+    """)
 
-class _Anonymous(_Parameter):
+Anonymous = signal('Anonymous',
     """Singleton used to signal "Anonymous Sender"
 
     The Anonymous object is used to signal that the sender
@@ -65 +58 @@
         in either function then all messages are routed
         as though there was a single sender (Anonymous)
         being used everywhere.
-    """
-Anonymous = _Anonymous()
+    """)
 
 WEAKREF_TYPES = (weakref.ReferenceType, saferef.BoundMethodWeakref)