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

Merge branch 'master' of https://github.com/KarimAllah/mongoengine into choices

Browse Source 
Conflicts:
	mongoengine/base.py
This commit is contained in:
Ross Lawley 2011-11-04 01:34:58 -07:00
commit a4e8177b76
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mongoengine/base.py
View File

@ -146,6 +146,7 @@ class BaseField(object):
# Get value from document instance if available, if not use default
value = instance._data.get(self.name)
if value is None:
value = self.default
# Allow callable default values
@ -192,11 +193,16 @@ class BaseField(object):
pass
def _validate(self, value):
# check choices
if self.choices is not None:
option_keys = [option_key for option_key, option_value in self.choices]
if value not in option_keys:
self.error('Value must be one of %s' % unicode(option_keys))
if type(choices[0]) is tuple:
option_keys = [option_key for option_key, option_value in self.choices]
if value not in option_keys:
self.error('Value must be one of %s' % unicode(option_keys))
else:
if value not in self.choices:
self.error('Value must be one of %s' % unicode(option_keys))
# check validation argument
if self.validation is not None: