From 83e00a237158f7961b06abd31c2ed867f1831c3f Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Fri, 22 Feb 2008 04:58:53 +0000 Subject: queryset-refactor: Whilst writing a test to bullet-proof [7141], a bug showed up. git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@7143 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/models/options.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'django') diff --git a/django/db/models/options.py b/django/db/models/options.py index 7fa7fe0174..0796a3f7c9 100644 --- a/django/db/models/options.py +++ b/django/db/models/options.py @@ -59,7 +59,10 @@ class Options(object): 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 attr_name in meta_attrs: + setattr(self, attr_name, meta_attrs.pop(attr_name)) + elif hasattr(self.meta, attr_name): + setattr(self, attr_name, getattr(self.meta, attr_name)) # unique_together can be either a tuple of tuples, or a single # tuple of two strings. Normalize it to a tuple of tuples, so that -- cgit v1.3