p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Luke Plant 2006-02-03 20:42:44 +00:00
parent 2ff5e5e765
commit 3c1bdb0d90
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/db/models/base.py
View File

@ -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):