mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-04-01 03:56:42 +00:00
Code Issues 32 Releases Wiki Activity

Removed double pop from meta_attrs.

Browse Source
This commit is contained in:
Jon Dufresne 2015-03-20 17:33:23 -07:00 committed by Tim Graham
parent 2444c231e1
commit e304e13448
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -226,11 +226,8 @@ class Options(object):
setattr(self, attr_name, getattr(self.meta, attr_name)) setattr(self, attr_name, getattr(self.meta, attr_name))
self.original_attrs[attr_name] = getattr(self, attr_name) self.original_attrs[attr_name] = getattr(self, attr_name)
ut = meta_attrs.pop('unique_together', self.unique_together) self.unique_together = normalize_together(self.unique_together)
self.unique_together = normalize_together(ut) self.index_together = normalize_together(self.index_together)
it = meta_attrs.pop('index_together', self.index_together)
self.index_together = normalize_together(it)
# verbose_name_plural is a special case because it uses a 's' # verbose_name_plural is a special case because it uses a 's'
# by default. # by default.