Ticket #5817: model_meta_w_inheritance.diff

options.py

@@ -47 +47 @@
 
         # Next, apply any overridden values from 'class Meta'.
         if self.meta:
-            meta_attrs = self.meta.__dict__
-            del meta_attrs['__module__']
-            del meta_attrs['__doc__']
+            # Build list of attributes - don't use __dict__, as we want to include
+            # super class attributes as well.
+            meta_attrs = dict([
+                (name, getattr(self.meta, name)) 
+                for name in dir(self.meta) 
+                # exclude python built-in attributes
+                if not name.startswith('__')])
             for attr_name in DEFAULT_NAMES:
                 setattr(self, attr_name, meta_attrs.pop(attr_name, getattr(self, attr_name)))
             # verbose_name_plural is a special case because it uses a 's'