Ticket #7506: related.diff

related.py

@@ -98 +98 @@
     def contribute_to_class(self, cls, name):
         sup = super(RelatedField, self)
 
-        # Add an accessor to allow easy determination of the related query path for this field
-        self.related_query_name = curry(self._get_related_query_name, cls._meta)
+        self._cls_object_name = cls._meta.object_name
 
         if hasattr(sup, 'contribute_to_class'):
             sup.contribute_to_class(cls, name)
@@ -111 +110 @@
         if not cls._meta.abstract and self.rel.related_name:
             self.rel.related_name = self.rel.related_name % {'class': cls.__name__.lower()}
 
+    # Accessor to allow easy determination of the related query path for this field
+    def related_query_name(self):
+        # This method defines the name that can be used to identify this
+        # related object in a table-spanning query. It uses the lower-cased
+        # object_name by default, but this can be overridden with the
+        # "related_name" option.
+        return self.rel.related_name or self._cls_object_name.lower()
+
     def set_attributes_from_rel(self):
         self.name = self.name or (self.rel.to._meta.object_name.lower() + '_' + self.rel.to._meta.pk.name)
         self.verbose_name = self.verbose_name or self.rel.to._meta.verbose_name
@@ -150 +157 @@
             return []
         raise TypeError, "Related Field has invalid lookup: %s" % lookup_type
 
-    def _get_related_query_name(self, opts):
-        # This method defines the name that can be used to identify this
-        # related object in a table-spanning query. It uses the lower-cased
-        # object_name by default, but this can be overridden with the
-        # "related_name" option.
-        return self.rel.related_name or opts.object_name.lower()
-
 class SingleRelatedObjectDescriptor(object):
     # This class provides the functionality that makes the related-object
     # managers available as attributes on a model class, for fields that have