diff options
| author | Loic Bistuer <loic.bistuer@sixmedia.com> | 2014-01-22 16:53:41 +0700 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-01-28 08:17:01 -0500 |
| commit | 3e4dc5ecf25aa2b38eed73472899f0de5a319c04 (patch) | |
| tree | 8623159df0c14a836a2207df8f475a38e6277e05 /django/db/models/manager.py | |
| parent | 88a2d39159872f6a7fced1bae591550650fd7f38 (diff) | |
Fixed #21853 -- Fixed Manager.__module__ to properly return 'django.db.models.manager'.
The combination of BaseManager.from_queryset() and RenameMethodsBase results in
Manager.__module__ having the wrong value. This can be an issue when trying to
pickle the Manager class.
Diffstat (limited to 'django/db/models/manager.py')
| -rw-r--r-- | django/db/models/manager.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/django/db/models/manager.py b/django/db/models/manager.py index 299faa0917..f014edcd76 100644 --- a/django/db/models/manager.py +++ b/django/db/models/manager.py @@ -190,7 +190,9 @@ class BaseManager(six.with_metaclass(RenameManagerMethods)): # understanding of how this comes into play. return self.get_queryset() -Manager = BaseManager.from_queryset(QuerySet, class_name='Manager') + +class Manager(BaseManager.from_queryset(QuerySet)): + pass class ManagerDescriptor(object): |