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

Fixed a recursion error in Django 1.1

Browse source
This commit is contained in:
Paul McLanahan 2011-03-29 21:57:49 -04:00
parent 04c848e8c7
commit d8798fb784
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

@ -100,7 +100,7 @@ class PassThroughManager(models.Manager):
objects = PassThroughManager(PostQuerySet)
'''
# pickling causes recursion errors
_deny_methods = ['__getstate__', '__setstate__']
_deny_methods = ['__getstate__', '__setstate__', '_db']
def __init__(self, queryset_cls=None):
self._queryset_cls = queryset_cls
@ -113,7 +113,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

@ -131,7 +131,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 {