summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Holtermann <info@markusholtermann.eu>2015-01-05 14:36:24 +0100
committerTim Graham <timograham@gmail.com>2015-01-05 10:30:15 -0500
commit05f702b94ca4ad77236a1e299270e8014def02e6 (patch)
tree0cc85010abf245db4441ea55533cff71defb5b0e
parent572ad9a92e08797f12e547477efcce7893159cfb (diff)
Renamed flag for detecting managers built from QuerySets with as_manager().
-rw-r--r--django/db/models/manager.py2
-rw-r--r--django/db/models/query.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/django/db/models/manager.py b/django/db/models/manager.py
index 5ae173a1f6..179ea7cee3 100644
--- a/django/db/models/manager.py
+++ b/django/db/models/manager.py
@@ -92,7 +92,7 @@ class BaseManager(object):
Raises a ValueError if the manager is dynamically generated.
"""
qs_class = self._queryset_class
- if getattr(self, '_built_as_manager', False):
+ if getattr(self, '_built_with_as_manager', False):
# using MyQuerySet.as_manager()
return (
True, # as_manager
diff --git a/django/db/models/query.py b/django/db/models/query.py
index 8f82c0cd73..318e3ecf84 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -68,7 +68,7 @@ class QuerySet(object):
# Address the circular dependency between `Queryset` and `Manager`.
from django.db.models.manager import Manager
manager = Manager.from_queryset(cls)()
- manager._built_as_manager = True
+ manager._built_with_as_manager = True
return manager
as_manager.queryset_only = True
as_manager = classmethod(as_manager)