summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Cramer <dcramer@gmail.com>2013-01-14 13:17:01 -0800
committerDavid Cramer <dcramer@gmail.com>2013-01-14 13:17:01 -0800
commitabbb88886bb1cd6013432c70586fbc118d378e27 (patch)
tree8ec6707e01b3cdf44a91adca20105669c2de55fb
parent6045efa029dcae58ec6aab20bdcb0dc325851048 (diff)
Move logic seperation as its not longer repetitive
-rw-r--r--django/db/models/deletion.py15
1 files changed, 6 insertions, 9 deletions
diff --git a/django/db/models/deletion.py b/django/db/models/deletion.py
index e4cd89233c..81f74923c2 100644
--- a/django/db/models/deletion.py
+++ b/django/db/models/deletion.py
@@ -262,14 +262,6 @@ class Collector(object):
self.data = SortedDict([(model, self.data[model])
for model in sorted_models])
- def send_post_delete_signals(self, model, instances):
- if model._meta.auto_created:
- return
- for obj in instances:
- signals.post_delete.send(
- sender=model, instance=obj, using=self.using
- )
-
@force_managed
def delete(self):
# sort instance collections
@@ -308,7 +300,12 @@ class Collector(object):
query = sql.DeleteQuery(model)
pk_list = [obj.pk for obj in instances]
query.delete_batch(pk_list, self.using)
- self.send_post_delete_signals(model, instances)
+
+ if not model._meta.auto_created:
+ for obj in instances:
+ signals.post_delete.send(
+ sender=model, instance=obj, using=self.using
+ )
# update collected instances
for model, instances_for_fieldvalues in six.iteritems(self.field_updates):