p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Renamed flag for detecting managers built from QuerySets with as_manager().

This commit is contained in:
Markus Holtermann 2015-01-05 14:36:24 +01:00 committed by Tim Graham
parent 572ad9a92e
commit 05f702b94c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/db/models/manager.py
View File

@ -92,7 +92,7 @@ class BaseManager(object):
Raises a ValueError if the manager is dynamically generated. Raises a ValueError if the manager is dynamically generated.
""" """
qs_class = self._queryset_class qs_class = self._queryset_class
if getattr(self, '_built_as_manager', False): if getattr(self, '_built_with_as_manager', False):
# using MyQuerySet.as_manager() # using MyQuerySet.as_manager()
return ( return (
True, # as_manager True, # as_manager

2
django/db/models/query.py
View File

@ -68,7 +68,7 @@ class QuerySet(object):
# Address the circular dependency between `Queryset` and `Manager`. # Address the circular dependency between `Queryset` and `Manager`.
from django.db.models.manager import Manager from django.db.models.manager import Manager
manager = Manager.from_queryset(cls)() manager = Manager.from_queryset(cls)()
manager._built_as_manager = True manager._built_with_as_manager = True
return manager return manager
as_manager.queryset_only = True as_manager.queryset_only = True
as_manager = classmethod(as_manager) as_manager = classmethod(as_manager)