diff options
| author | Jon Dufresne <jon.dufresne@gmail.com> | 2015-03-20 17:33:23 -0700 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-03-21 08:16:28 -0400 |
| commit | e304e1344857facd6356af9def3a7c9a78c528f9 (patch) | |
| tree | e8d7e8c452c2a32667e054d15e8a520a483ca046 | |
| parent | 2444c231e160436ae262dd9d06f3eb0627eeca8f (diff) | |
Removed double pop from meta_attrs.
| -rw-r--r-- | django/db/models/options.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/django/db/models/options.py b/django/db/models/options.py index e029ffef72..0762aa8df3 100644 --- a/django/db/models/options.py +++ b/django/db/models/options.py @@ -226,11 +226,8 @@ class Options(object): setattr(self, attr_name, getattr(self.meta, 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(ut) - - it = meta_attrs.pop('index_together', self.index_together) - self.index_together = normalize_together(it) + self.unique_together = normalize_together(self.unique_together) + self.index_together = normalize_together(self.index_together) # verbose_name_plural is a special case because it uses a 's' # by default. |