jyapayne/mongoengine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 0.7

Browse source 
Conflicts:
	mongoengine/base.py
This commit is contained in:
Ross Lawley 2012-08-07 10:41:49 +01:00
commit 52d80ac23c
12 changed files with 163 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mongoengine/fields.py
View file

@ -1333,7 +1333,7 @@ class UUIDField(BaseField):
super(UUIDField, self).__init__(**kwargs)
def to_python(self, value):
if not self.binary:
if not self._binary:
if not isinstance(value, basestring):
value = unicode(value)
return uuid.UUID(value)