Ticket #16176: patch_and_test.diff

django/db/models/base.py

@@ -252 +252 @@
                 cls.add_to_class(mgr_name, new_manager)
 
     def add_to_class(cls, name, value):
-        if hasattr(value, 'contribute_to_class'):
+        if isinstance(value, property):
+             setattr(cls, name, None)
+        elif hasattr(value, 'contribute_to_class'):
             value.contribute_to_class(cls, name)
         else:
             setattr(cls, name, value)

tests/regressiontests/model_inheritance_regress/models.py

@@ -182 +182 @@
 class Profile(User):
     profile_id = models.AutoField(primary_key=True)
     extra = models.CharField(max_length=30, blank=True)
+        
+        
+class SomeTestModel(models.Model):
+    some_field = models.CharField(max_length=100)
+
+    class Meta:
+        abstract = True
+                
+    @property
+    def other_field(self):
+        return "[OTHER] %s" % self.some_field
+
+class OtherModel(SomeTestModel):
+    other_field = models.CharField(max_length=100)
+    other_field2 = models.CharField(max_length=100)

tests/regressiontests/model_inheritance_regress/tests.py

@@ -13 +13 @@
     ParkingLot2, ParkingLot3, Supplier, Wholesaler, Child, SelfRefParent,
     SelfRefChild, ArticleWithAuthor, M2MChild, QualityControl, DerivedM,
     Person, BirthdayParty, BachelorParty, MessyBachelorParty,
-    InternalCertificationAudit, BusStation, TrainStation, User, Profile)
+    InternalCertificationAudit, BusStation, TrainStation, User, Profile, SomeTestModel, OtherModel)
 
 
 class ModelInheritanceTest(TestCase):
+
+    def test_16176(self):
+        # Regression for #16176
+        test1 = SomeTestModel(some_field = "hi")
+        test2 = OtherModel(other_field = "hi")
+        test3 = OtherModel(other_field2 = "hi")
+                
     def test_model_inheritance(self):
         # Regression for #7350, #7202
         # Check that when you create a Parent object with a specific reference
@@ -422 +429 @@
         form = ProfileForm({'username': "user_with_profile", 'extra': "hello"},
                            instance=p)
         self.assertTrue(form.is_valid())
+                
+