Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.2.X] Fixed #13206 -- call super().__init__() in Model.__init__ to …

…allow mixins to do things there. Backport of [15317].

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15320 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit c4b0878b4389f466d90ac458872df7ba28706023 1 parent 4cee764
@alex alex authored
View
2  django/db/models/base.py
@@ -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
@@ -359,6 +360,7 @@ def __init__(self, *args, **kwargs):
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):
View
8 tests/modeltests/model_inheritance/models.py
@@ -143,3 +143,11 @@ class Copy(NamedURL):
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
View
6 tests/modeltests/model_inheritance/tests.py
@@ -6,7 +6,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):
@@ -278,4 +278,6 @@ def test_multiple_table(self):
finally:
settings.DEBUG = old_DEBUG
-
+ def test_mixin_init(self):
+ m = MixinModel()
+ self.assertEqual(m.other_attr, 1)
Please sign in to comment.
Something went wrong with that request. Please try again.