Author: Alex
Date: 2011-01-25 21:42:31 -0600 (Tue, 25 Jan 2011)
New Revision: 15317
Modified:
django/trunk/django/db/models/base.py
django/trunk/tests/modeltests/model_inheritance/models.py
django/trunk/tests/modeltests/model_inheritance/tests.py
Log:
Fixed #13206 -- call super().__init__() in Model.__init__ to allow mixins to do
things there.
Modified: django/trunk/django/db/models/base.py
===================================================================
--- django/trunk/django/db/models/base.py 2011-01-26 03:34:16 UTC (rev
15316)
+++ django/trunk/django/db/models/base.py 2011-01-26 03:42:31 UTC (rev
15317)
@@ -1,6 +1,7 @@
import types
import sys
from itertools import izip
+
import django.db.models.manager # Imported to register signal handler.
from django.core.exceptions import ObjectDoesNotExist,
MultipleObjectsReturned, FieldError, ValidationError, NON_FIELD_ERRORS
from django.core import validators
@@ -361,6 +362,7 @@
pass
if kwargs:
raise TypeError("'%s' is an invalid keyword argument for this
function" % kwargs.keys()[0])
+ super(Model, self).__init__()
signals.post_init.send(sender=self.__class__, instance=self)
def __repr__(self):
Modified: django/trunk/tests/modeltests/model_inheritance/models.py
===================================================================
--- django/trunk/tests/modeltests/model_inheritance/models.py 2011-01-26
03:34:16 UTC (rev 15316)
+++ django/trunk/tests/modeltests/model_inheritance/models.py 2011-01-26
03:42:31 UTC (rev 15317)
@@ -143,3 +143,11 @@
def __unicode__(self):
return self.content
+
+class Mixin(object):
+ def __init__(self):
+ self.other_attr = 1
+ super(Mixin, self).__init__()
+
+class MixinModel(models.Model, Mixin):
+ pass
Modified: django/trunk/tests/modeltests/model_inheritance/tests.py
===================================================================
--- django/trunk/tests/modeltests/model_inheritance/tests.py 2011-01-26
03:34:16 UTC (rev 15316)
+++ django/trunk/tests/modeltests/model_inheritance/tests.py 2011-01-26
03:42:31 UTC (rev 15317)
@@ -4,7 +4,7 @@
from django.test import TestCase
from models import (Chef, CommonInfo, ItalianRestaurant, ParkingLot, Place,
- Post, Restaurant, Student, StudentWorker, Supplier, Worker)
+ Post, Restaurant, Student, StudentWorker, Supplier, Worker, MixinModel)
class ModelInheritanceTests(TestCase):
@@ -269,3 +269,7 @@
self.assertNumQueries(1,
lambda: ItalianRestaurant.objects.select_related("chef")[0].chef
)
+
+ def test_mixin_init(self):
+ m = MixinModel()
+ self.assertEqual(m.other_attr, 1)
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
