Ticket #5373: 5373.5.diff

django/db/models/fields/related.py

@@ -13 +13 @@
 from django.core import exceptions
 from django import forms
 
-
 RECURSIVE_RELATIONSHIP_CONSTANT = 'self'
 
 pending_lookups = {}
@@ -111 +110 @@
 
     def set_attributes_from_rel(self):
         self.name = self.name or (self.rel.to._meta.object_name.lower() + '_' + self.rel.to._meta.pk.name)
-        if self.verbose_name is None:
+        if (self.verbose_name != self.rel.to._meta.verbose_name):
+          print "**I can get here**"
+        if self.verbose_name is None: 
             self.verbose_name = self.rel.to._meta.verbose_name
+            print "----------- but never here -----------"
         self.rel.field_name = self.rel.field_name or self.rel.to._meta.pk.name
 
     def do_related_class(self, other, cls):