pub/mongoengine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed queryset manager issue (MongoEngine/mongoengine#52)

Browse Source
This commit is contained in:
Ross Lawley
2012-08-01 13:51:51 +01:00
parent 8df81571fc
commit 0018c38b83
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changelog.rst
View File

@@ -5,6 +5,7 @@ Changelog
Changes in 0.6.X Changes in 0.6.X
================ ================
- Fixed queryset manager issue (MongoEngine/mongoengine#52)
- Fixed FileField comparision (hmarr/mongoengine#547) - Fixed FileField comparision (hmarr/mongoengine#547)
Changes in 0.6.18 Changes in 0.6.18

6
mongoengine/queryset.py
View File

@@ -1881,10 +1881,10 @@ class QuerySetManager(object):
queryset_class = owner._meta['queryset_class'] or QuerySet queryset_class = owner._meta['queryset_class'] or QuerySet
queryset = queryset_class(owner, owner._get_collection()) queryset = queryset_class(owner, owner._get_collection())
if self.get_queryset: if self.get_queryset:
var_names = self.get_queryset.func_code.co_varnames arg_count = self.get_queryset.func_code.co_argcount
if len(var_names) == 1: if arg_count == 1:
queryset = self.get_queryset(queryset) queryset = self.get_queryset(queryset)
elif len(var_names) == 2: elif arg_count == 2:
queryset = self.get_queryset(owner, queryset) queryset = self.get_queryset(owner, queryset)
else: else:
queryset = partial(self.get_queryset, owner, queryset) queryset = partial(self.get_queryset, owner, queryset)

3
tests/test_queryset.py
View File

@@ -2287,7 +2287,8 @@ class QuerySetTest(unittest.TestCase):
@queryset_manager @queryset_manager
def objects(cls, qryset): def objects(cls, qryset):
return qryset(deleted=False) opts = {"deleted": False}
return qryset(**opts)
@queryset_manager @queryset_manager
def music_posts(doc_cls, queryset, deleted=False): def music_posts(doc_cls, queryset, deleted=False):