Hopiu/django-model-utils
1
0
Fork 0
mirror of https://github.com/Hopiu/django-model-utils.git synced 2026-03-17 04:10:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged in fix for Django 1.1 recursion error from Paul McLanahan.

Browse source
This commit is contained in:
Carl Meyer 2011-03-30 10:20:37 -04:00
commit 7c19b761e2
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
model_utils/managers.py
View file

@ -101,7 +101,7 @@ class PassThroughManager(models.Manager):
"""
# pickling causes recursion errors
_deny_methods = ['__getstate__', '__setstate__']
_deny_methods = ['__getstate__', '__setstate__', '_db']
def __init__(self, queryset_cls=None):
self._queryset_cls = queryset_cls
@ -114,7 +114,10 @@ class PassThroughManager(models.Manager):
def get_query_set(self):
if self._queryset_cls is not None:
return self._queryset_cls(self.model, using=self._db)
kargs = {'model': self.model}
if hasattr(self, '_db'):
kargs['using'] = self._db
return self._queryset_cls(**kargs)
return super(PassThroughManager, self).get_query_set()

2
model_utils/tests/models.py
View file

@ -145,7 +145,7 @@ class DudeQuerySet(models.query.QuerySet):
class AbidingManager(PassThroughManager):
def get_query_set(self):
return DudeQuerySet(self.model, using=self._db).abiding()
return DudeQuerySet(self.model).abiding()
def get_stats(self):
return {