Ticket #11134: 11134-against-10791.diff

django/dispatch/dispatcher.py

@@ -192 +192 @@
         receivers.
         """
         none_senderkey = _make_id(None)
+        receivers = []
 
         for (receiverkey, r_senderkey), receiver in self.receivers:
             if r_senderkey == none_senderkey or r_senderkey == senderkey:
@@ -199 +200 @@
                     # Dereference the weak reference.
                     receiver = receiver()
                     if receiver is not None:
-                        yield receiver
+                        receivers.append(receiver)
                 else:
-                    yield receiver
+                    receivers.append(receiver)
+        return receivers
 
     def _remove_receiver(self, receiver):
         """Remove dead receivers from connections."""

tests/modeltests/signals/models.py

@@ -3 +3 @@
 """
 
 from django.db import models
+from django.db.models import signals
+
+from django.test import TestCase
 
 class Person(models.Model):
     first_name = models.CharField(max_length=20)
@@ -38 +41 @@
 
 post_delete_test = PostDeleteHandler()
 
+
+class MyReceiver(object):
+    def __init__(self, param):
+        self.param = param
+        self._run = False
+
+    def __call__(self, signal, sender, **kwargs):
+        self._run = True
+        signal.disconnect(receiver=self, sender=sender)
+
+
+class TestDisconnectInReceiver(TestCase):
+    def test_two_receivers_work_fine(self):
+        a, b = MyReceiver(1), MyReceiver(2)
+        signals.post_save.connect(sender=Person, receiver=a)
+        signals.post_save.connect(sender=Person, receiver=b)
+        p1 = Person(first_name='John', last_name='Smith')
+        p1.save()
+        assert a._run
+        assert b._run
+        assert [] == signals.post_save.receivers
+
+        
+
 __test__ = {'API_TESTS':"""
 
 # Save up the number of connected signals so that we can check at the end