mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 18:29:11 +00:00
Code Issues 32 Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Malcolm Tredinnick 2008-03-21 16:06:41 +00:00
parent 9512ebba44
commit 0187f53f09
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
django/db/models/base.py
View File

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