From c4b0878b4389f466d90ac458872df7ba28706023 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Wed, 26 Jan 2011 03:52:52 +0000 Subject: [PATCH] [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 --- django/db/models/base.py | 2 ++ tests/modeltests/model_inheritance/models.py | 8 ++++++++ tests/modeltests/model_inheritance/tests.py | 6 ++++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/django/db/models/base.py b/django/db/models/base.py index 462483d058..e857a875a1 100644 --- a/django/db/models/base.py +++ b/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 @@ class Model(object): 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): diff --git a/tests/modeltests/model_inheritance/models.py b/tests/modeltests/model_inheritance/models.py index 6cee512fb3..a0fed8a5cc 100644 --- a/tests/modeltests/model_inheritance/models.py +++ b/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 diff --git a/tests/modeltests/model_inheritance/tests.py b/tests/modeltests/model_inheritance/tests.py index 80dd0ded5c..d4a24f5545 100644 --- a/tests/modeltests/model_inheritance/tests.py +++ b/tests/modeltests/model_inheritance/tests.py @@ -6,7 +6,7 @@ from django.db import connection 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 @@ class ModelInheritanceTests(TestCase): finally: settings.DEBUG = old_DEBUG - + def test_mixin_init(self): + m = MixinModel() + self.assertEqual(m.other_attr, 1)