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

Merge branch 'master' into 0.8

Browse Source 
Conflicts:
	AUTHORS
	mongoengine/base.py
	tests/test_dereference.py
This commit is contained in:
Ross Lawley
2013-04-18 13:30:00 +00:00
parent 1108586303 3f49923298
commit 76fddd0db0
4 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mongoengine/dereference.py
View File

@@ -115,7 +115,7 @@ class DeReference(object):
object_map = {}
for col, dbrefs in self.reference_map.iteritems():
keys = object_map.keys()
refs = list(set([dbref for dbref in dbrefs if str(dbref) not in keys]))
refs = list(set([dbref for dbref in dbrefs if unicode(dbref).encode('utf-8') not in keys]))
if hasattr(col, 'objects'): # We have a document class for the refs
references = col.objects.in_bulk(refs)
for key, doc in references.iteritems():