Ticket #6108: pre_delete.patch

django/db/models/query.py

@@ -1132 +1132 @@
 
         # Pre notify all instances to be deleted
         for pk_val, instance in seen_objs[cls]:
-            dispatcher.send(signal=signals.pre_delete, sender=cls, instance=instance)
+            dispatcher.send(signal=signals.pre_delete, sender=cls, instance=instance, all_objs = seen_objs)
 
         pk_list = [pk for pk,instance in seen_objs[cls]]
         for related in cls._meta.get_all_related_many_to_many_objects():

tests/modeltests/signals/models.py

@@ -24 +24 @@
         else:
             print 'Is updated'
 
-def pre_delete_test(sender, instance, **kwargs):
+def pre_delete_test(sender, instance, all_objs, **kwargs):
     print 'pre_delete signal,', instance
     print 'instance.id is not None: %s' % (instance.id != None)  
+    print 'all objects to be deleted: %s' % all_objs
 
 def post_delete_test(sender, instance, **kwargs):
     print 'post_delete signal,', instance
@@ -53 +54 @@
 >>> p1.delete()
 pre_delete signal, Tom Smith
 instance.id is not None: True
+all objects to be deleted: {<class 'modeltests.signals.models.Person'>: [(1L, <Person: Tom Smith>)]}
 post_delete signal, Tom Smith
 instance.id is None: False
 
@@ -72 +74 @@
 >>> p2.delete()
 pre_delete signal, James Jones
 instance.id is not None: True
+all objects to be deleted: {<class 'modeltests.signals.models.Person'>: [(99998, <Person: James Jones>)]}
 post_delete signal, James Jones
 instance.id is None: False