From 6cfea0d5b935ae3b487f508892a2585f422f2035 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Thu, 26 Jan 2006 17:12:32 +0000 Subject: [PATCH] magic-removal: Changed RelatedObject to take parent_model, not parent_opts, in constructor git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2128 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/models/fields/related.py | 2 +- django/db/models/options.py | 4 ++-- django/db/models/related.py | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py index 8b10e366e0..faea35c99e 100644 --- a/django/db/models/fields/related.py +++ b/django/db/models/fields/related.py @@ -58,7 +58,7 @@ class RelatedField(object): def do_related_class(self, other, cls): self.set_attributes_from_rel() - related = RelatedObject(other._meta, cls, self) + related = RelatedObject(other, cls, self) self.contribute_to_related_class(other, related) #HACK diff --git a/django/db/models/options.py b/django/db/models/options.py index 97d3659f60..026104aa0e 100644 --- a/django/db/models/options.py +++ b/django/db/models/options.py @@ -123,7 +123,7 @@ class Options: for klass in get_models(): for f in klass._meta.fields: if f.rel and self == f.rel.to._meta: - rel_objs.append(RelatedObject(self, klass, f)) + rel_objs.append(RelatedObject(f.rel.to, klass, f)) self._all_related_objects = rel_objs return rel_objs @@ -157,7 +157,7 @@ class Options: for klass in get_models(): for f in klass._meta.many_to_many: if f.rel and self == f.rel.to._meta: - rel_objs.append(RelatedObject(self, klass, f)) + rel_objs.append(RelatedObject(f.rel.to, klass, f)) self._all_related_many_to_many_objects = rel_objs return rel_objs diff --git a/django/db/models/related.py b/django/db/models/related.py index 57a1ffad9d..a1bdb48d8b 100644 --- a/django/db/models/related.py +++ b/django/db/models/related.py @@ -10,8 +10,8 @@ class BoundRelatedObject(object): return repr(self.__dict__) class RelatedObject(object): - def __init__(self, parent_opts, model, field): - self.parent_opts = parent_opts + def __init__(self, parent_model, model, field): + self.parent_model = parent_model self.model = model self.opts = model._meta self.field = field @@ -94,6 +94,6 @@ class RelatedObject(object): # # This method returns "lcom_bestofaward". # Place.lcom_bestofaward_set # "lcom_bestofaward" rel_obj_name = self.field.rel.related_name or self.opts.object_name.lower() - if self.parent_opts.app_label != self.opts.app_label: + if self.parent_model._meta.app_label != self.opts.app_label: rel_obj_name = '%s_%s' % (self.opts.app_label, rel_obj_name) return rel_obj_name