Ticket #7588: 7588.naive.r8914.diff

File 7588.naive.r8914.diff, 692 bytes (added by Mathijs de Bruin, 16 years ago)

'Naive' patch, updated to r8914.

  • django/db/models/base.py

    diff --git a/django/db/models/base.py b/django/db/models/base.py
    index da3d0e7..4e4bc0c 100644
    a b class ModelBase(type):  
    109109
    110110            # .. and abstract ones.
    111111            else:
     112                # Fix for Ticket #7588
     113                # Abstract base-class inheritance from multi-table inheritance
     114                new_class._meta.parents.update(base._meta.parents)
     115               
    112116                # Check for clashes between locally declared fields and those on the ABC.
    113117                parent_fields = base._meta.local_fields + base._meta.local_many_to_many
    114118                for field in parent_fields:
Back to Top