Ticket #13251: changes.patch

django/db/models/base.py

@@ -631 +631 @@
         self._collect_sub_objects(seen_objs)
 
         # Actually delete the objects.
-        delete_objects(seen_objs, using)
+        delete_objects(seen_objs, using, self)
 
     delete.alters_data = True
 

django/db/models/signals.py

@@ -8 +8 @@
 pre_save = Signal(providing_args=["instance", "raw"])
 post_save = Signal(providing_args=["instance", "raw", "created"])
 
-pre_delete = Signal(providing_args=["instance"])
-post_delete = Signal(providing_args=["instance"])
+pre_delete = Signal(providing_args=["instance", "origin"])
+post_delete = Signal(providing_args=["instance", "origin"])
 
 post_syncdb = Signal(providing_args=["class", "app", "created_models", "verbosity", "interactive"])
 

django/db/models/query.py

@@ -437 +437 @@
 
             if not seen_objs:
                 break
-            delete_objects(seen_objs, del_query.db)
+            delete_objects(seen_objs, del_query.db, self)
 
         # Clear the result cache, in case this QuerySet gets reused.
         self._result_cache = None
@@ -1266 +1266 @@
                                     pass
     return obj, index_end
 
-def delete_objects(seen_objs, using):
+def delete_objects(seen_objs, using, origin):
     """
     Iterate through a list of seen classes, and remove any instances that are
     referred to.
@@ -1296 +1296 @@
             # Pre-notify all instances to be deleted.
             for pk_val, instance in items:
                 if not cls._meta.auto_created:
-                    signals.pre_delete.send(sender=cls, instance=instance)
+                    signals.pre_delete.send(sender=cls, instance=instance, origin=origin)
 
             pk_list = [pk for pk,instance in items]
 
@@ -1328 +1328 @@
                         setattr(instance, field.attname, None)
 
                 if not cls._meta.auto_created:
-                    signals.post_delete.send(sender=cls, instance=instance)
+                    signals.post_delete.send(sender=cls, instance=instance, origin=origin)
                 setattr(instance, cls._meta.pk.attname, None)
 
         if forced_managed: