summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndriy Sokolovskiy <me@asokolovskiy.com>2015-06-18 16:44:39 +0300
committerTim Graham <timograham@gmail.com>2015-06-29 21:17:19 -0400
commit7866968eb3a4cca57ded043053c4568257599279 (patch)
tree5dcc27beb2499f49910c818e259a0abe39ce0002
parentc0cf73a57d7f77af348aeb854e7b4f670dc3cee7 (diff)
Removed unused condition for the abstract model in ensure_default_manager()
-rw-r--r--django/db/models/manager.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/django/db/models/manager.py b/django/db/models/manager.py
index f4dee5dec7..bedf93a643 100644
--- a/django/db/models/manager.py
+++ b/django/db/models/manager.py
@@ -15,10 +15,7 @@ def ensure_default_manager(cls):
points to a plain Manager instance (which could be the same as
_default_manager if it's not a subclass of Manager).
"""
- if cls._meta.abstract:
- setattr(cls, 'objects', AbstractManagerDescriptor(cls))
- return
- elif cls._meta.swapped:
+ if cls._meta.swapped:
setattr(cls, 'objects', SwappedManagerDescriptor(cls))
return
if not getattr(cls, '_default_manager', None):