From 3c1bdb0d90c82a9c0abf77b20573d63a592b08ad Mon Sep 17 00:00:00 2001 From: Luke Plant Date: Fri, 3 Feb 2006 20:42:44 +0000 Subject: [PATCH] magic-removal: Fixed __collect_sub_objects, so delete() now works and some more tests pass. git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2248 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/models/base.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/django/db/models/base.py b/django/db/models/base.py index 46baccb45d..0040ce7ed8 100644 --- a/django/db/models/base.py +++ b/django/db/models/base.py @@ -202,16 +202,16 @@ class Model(object): seen_objs.setdefault(self.__class__, {})[pk_val] = self for related in self._meta.get_all_related_objects(): - rel_opts_name = related.OLD_get_accessor_name() + rel_opts_name = related.get_accessor_name() if isinstance(related.field.rel, OneToOne): try: - sub_obj = getattr(self, 'get_%s' % rel_opts_name)() + sub_obj = getattr(self, rel_opts_name) except ObjectDoesNotExist: pass else: sub_obj.__collect_sub_objects(seen_objs) else: - for sub_obj in getattr(self, 'get_%s_list' % rel_opts_name)(): + for sub_obj in getattr(self, rel_opts_name).all(): sub_obj.__collect_sub_objects(seen_objs) def delete(self):