diff options
| author | Дилян Палаузов <Dilyan.Palauzov@db.com> | 2018-01-31 10:21:41 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2018-01-31 10:22:56 -0500 |
| commit | f427ffcccbb29550d18eff4ee255e278157b240d (patch) | |
| tree | 1b02e8909fba99e3650609b6350cb385518e9e03 | |
| parent | 4775dcb521f87694607c5a1fca052ffffc0bfcae (diff) | |
Fixed #29093 -- Simplified a few lines in ModelBase.__new__().
| -rw-r--r-- | django/db/models/base.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/django/db/models/base.py b/django/db/models/base.py index 8d4e19fa5a..20d1c73ddf 100644 --- a/django/db/models/base.py +++ b/django/db/models/base.py @@ -78,10 +78,7 @@ class ModelBase(type): new_class = super_new(cls, name, bases, new_attrs, **kwargs) attr_meta = attrs.pop('Meta', None) abstract = getattr(attr_meta, 'abstract', False) - if not attr_meta: - meta = getattr(new_class, 'Meta', None) - else: - meta = attr_meta + meta = attr_meta or getattr(new_class, 'Meta', None) base_meta = getattr(new_class, '_meta', None) app_label = None |
