Ticket #11116: 11116_proxy_model_delete.diff

django/db/models/base.py

@@ -541 +541 @@
         parent_stack = self._meta.parents.values()
         while parent_stack:
             link = parent_stack.pop()
-            parent_obj = getattr(self, link.name)
-            if parent_obj._meta.parents:
-                parent_stack.extend(parent_obj._meta.parents.values())
-                continue
-            # At this point, parent_obj is base class (no ancestor models). So
-            # delete it and all its descendents.
-            parent_obj._collect_sub_objects(seen_objs)
+            if link is not None:
+                parent_obj = getattr(self, link.name)
+                if parent_obj._meta.parents:
+                    parent_stack.extend(parent_obj._meta.parents.values())
+                    continue
+                # At this point, parent_obj is base class (no ancestor models). So
+                # delete it and all its descendents.
+                parent_obj._collect_sub_objects(seen_objs)
 
     def delete(self):
         assert self._get_pk_val() is not None, "%s object can't be deleted because its %s attribute is set to None." % (self._meta.object_name, self._meta.pk.attname)