Renamed flag for detecting managers built from QuerySets with as_mana…

…ger().
django · Jan 5, 2015 · 05f702b · 05f702b
1 parent 572ad9a
commit 05f702b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/django/db/models/manager.py b/django/db/models/manager.py
@@ -92,7 +92,7 @@ def deconstruct(self):
         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
@@ -68,7 +68,7 @@ def as_manager(cls):
         # 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)