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

@@ -149,6 +149,7 @@ answer newbie questions, and generally made Django that much better:
     pgross@thoughtworks.com
     phaedo <http://phaedo.cx/>
     phil@produxion.net
+    phil.h.smith@gmail.com
     Gustavo Picon
     Luke Plant <http://lukeplant.me.uk/>
     plisk

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__')})