Author: jacob
Date: 2007-09-24 13:27:42 -0500 (Mon, 24 Sep 2007)
New Revision: 6411

Modified:
   django/trunk/django/db/models/query.py
   django/trunk/tests/modeltests/signals/models.py
Log:
Fixed #5559: instances sent via post-save signals no longer have pks of None. 
Thanks, Joseph Kocherhans.

Modified: django/trunk/django/db/models/query.py
===================================================================
--- django/trunk/django/db/models/query.py      2007-09-23 06:18:49 UTC (rev 
6410)
+++ django/trunk/django/db/models/query.py      2007-09-24 18:27:42 UTC (rev 
6411)
@@ -1180,7 +1180,7 @@
                 if field.rel and field.null and field.rel.to in seen_objs:
                     setattr(instance, field.attname, None)
 
+            dispatcher.send(signal=signals.post_delete, sender=cls, 
instance=instance)
             setattr(instance, cls._meta.pk.attname, None)
-            dispatcher.send(signal=signals.post_delete, sender=cls, 
instance=instance)
 
     transaction.commit_unless_managed()

Modified: django/trunk/tests/modeltests/signals/models.py
===================================================================
--- django/trunk/tests/modeltests/signals/models.py     2007-09-23 06:18:49 UTC 
(rev 6410)
+++ django/trunk/tests/modeltests/signals/models.py     2007-09-24 18:27:42 UTC 
(rev 6411)
@@ -54,7 +54,7 @@
 pre_delete signal, Tom Smith
 instance.id is not None: True
 post_delete signal, Tom Smith
-instance.id is None: True
+instance.id is None: False
 
 >>> p2 = Person(first_name='James', last_name='Jones')
 >>> p2.id = 99999
@@ -73,7 +73,7 @@
 pre_delete signal, James Jones
 instance.id is not None: True
 post_delete signal, James Jones
-instance.id is None: True
+instance.id is None: False
 
 >>> Person.objects.all()
 [<Person: James Jones>]


--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to