queryset-refactor: Correctly inherit m2m fields from abstract base classes.

Based on a patch from cide@ctmod.net. Fixed #6844.


git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@7345 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 8 insertions, 2 deletions

diff --git a/django/db/models/base.py b/django/db/models/base.py
index 02c5398fb1..6fad7070ba 100644
--- a/django/db/models/base.py
+++ b/django/db/models/base.py
@@ -20,6 +20,11 @@ from django.utils.functional import curry
 from django.utils.encoding import smart_str, force_unicode, smart_unicode
 from django.conf import settings
 
+try:
+    set
+except NameError:
+    from sets import Set as set     # Python 2.3 fallback
+
 class ModelBase(type):
     "Metaclass for all models"
     def __new__(cls, name, bases, attrs):
@@ -100,8 +105,9 @@ class ModelBase(type):
                     new_class.add_to_class(attr_name, field)
                 new_class._meta.parents[base] = field
             else:
-                names = [f.name for f in new_class._meta.local_fields + new_class._meta.many_to_many]
-                for field in base._meta.local_fields:
+                # The abstract base class case.
+                names = set([f.name for f in new_class._meta.local_fields + new_class._meta.many_to_many])
+                for field in base._meta.local_fields + base._meta.local_many_to_many:
                     if field.name in names:
                         raise FieldError('Local field %r in class %r clashes with field of similar name from abstract base class %r'
                                 % (field.name, name, base.__name__))