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

style tweaks + changelog entry

Browse Source
This commit is contained in:
Stefan Wojcik 2015-06-17 17:05:10 -07:00
parent 1233780265
commit b7ef82cb67
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changelog.rst
View File

@ -25,6 +25,7 @@ Changes in 0.9.X - DEV
- Updated URL and Email Field regex validators, added schemes argument to URLField validation. #652 - Updated URL and Email Field regex validators, added schemes argument to URLField validation. #652
- Removed get_or_create() deprecated since 0.8.0. #300 - Removed get_or_create() deprecated since 0.8.0. #300
- Capped collection multiple of 256. #1011 - Capped collection multiple of 256. #1011
- Added `BaseQuerySet.aggregate_sum` and `BaseQuerySet.aggregate_average` methods.
Changes in 0.9.0 Changes in 0.9.0
================ ================

14
mongoengine/queryset/base.py
View File

@ -1263,11 +1263,10 @@ class BaseQuerySet(object):
]) ])
if IS_PYMONGO_3: if IS_PYMONGO_3:
result = list(result) result = list(result)
if result:
return result[0]['total']
else: else:
if result['result']: result = result.get('result')
return result['result'][0]['total'] if result:
return result[0]['total']
return 0 return 0
def average(self, field): def average(self, field):
@ -1340,11 +1339,10 @@ class BaseQuerySet(object):
]) ])
if IS_PYMONGO_3: if IS_PYMONGO_3:
result = list(result) result = list(result)
if result:
return result[0]['total']
else: else:
if result['result']: result = result.get('result')
return result['result'][0]['total'] if result:
return result[0]['total']
return 0 return 0
def item_frequencies(self, field, normalize=False, map_reduce=True): def item_frequencies(self, field, normalize=False, map_reduce=True):