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

magic-removal: Folded django.db.models.options.Options.merge_meta into contribute_to_class(). No need to make it a separate method.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2570 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2006-03-27 23:04:41 +00:00
parent dd8b60bd17
commit 1200356c1c
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
django/db/models/options.py
View File

@ -33,15 +33,6 @@ class Options:
self.one_to_one_field = None
self.parents = []
def merge_meta(self):
meta_attrs = self.meta.__dict__
del meta_attrs['__module__']
del meta_attrs['__doc__']
for attr_name in DEFAULT_NAMES:
setattr(self, attr_name, meta_attrs.pop(attr_name, getattr(self, attr_name)))
if meta_attrs != {}:
raise TypeError, "'class Meta' got invalid attribute(s): %s" % ','.join(meta_attrs.keys())
def contribute_to_class(self, cls, name):
cls._meta = self
self.object_name = cls.__name__
@ -51,7 +42,13 @@ class Options:
self.verbose_name = get_verbose_name(self.object_name)
self.verbose_name_plural = self.verbose_name + 's'
if self.meta:
self.merge_meta()
meta_attrs = self.meta.__dict__
del meta_attrs['__module__']
del meta_attrs['__doc__']
for attr_name in DEFAULT_NAMES:
setattr(self, attr_name, meta_attrs.pop(attr_name, getattr(self, attr_name)))
if meta_attrs != {}:
raise TypeError, "'class Meta' got invalid attribute(s): %s" % ','.join(meta_attrs.keys())
del self.meta
def _prepare(self, model):
@ -217,7 +214,7 @@ class AdminOptions:
fs_options = fieldset[1]
classes = fs_options.get('classes', ())
description = fs_options.get('description', '')
new_fieldset_list.append(AdminFieldSet(fieldset[0], classes,
new_fieldset_list.append(AdminFieldSet(fieldset[0], classes,
opts.get_field, fs_options['fields'], description))
return new_fieldset_list