From c27ba0b2097267796bc97daea81ee62dd10554ff Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Mon, 26 Feb 2007 09:06:23 +0000 Subject: [PATCH] Fixed #2363 -- Fixed subclass checking in ModelBase to allow for mixin superclasses. Thanks phil.h.smith@gmail.com. git-svn-id: http://code.djangoproject.com/svn/django/trunk@4607 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- AUTHORS | 1 + django/db/models/base.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index d640706ec96..b4abfcf9cc4 100644 --- a/AUTHORS +++ b/AUTHORS @@ -149,6 +149,7 @@ answer newbie questions, and generally made Django that much better: pgross@thoughtworks.com phaedo phil@produxion.net + phil.h.smith@gmail.com Gustavo Picon Luke Plant plisk diff --git a/django/db/models/base.py b/django/db/models/base.py index 5436d80a0e9..ff99fd8b464 100644 --- a/django/db/models/base.py +++ b/django/db/models/base.py @@ -22,8 +22,8 @@ class ModelBase(type): "Metaclass for all models" def __new__(cls, name, bases, attrs): # If this isn't a subclass of Model, don't do anything special. - if not bases or bases == (object,): - return type.__new__(cls, name, bases, attrs) + if name == 'Model' or not filter(lambda b: issubclass(b, Model), bases): + return super(ModelBase, cls).__new__(cls, name, bases, attrs) # Create the class. new_class = type.__new__(cls, name, bases, {'__module__': attrs.pop('__module__')})