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

[fix]fix some personal hobby

Browse Source
This commit is contained in:
Bo.Yi 2017-07-16 18:47:20 +08:00
parent 820b5cbb86
commit 9f02f71c52
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mongoengine/base/document.py
View File

@ -1082,8 +1082,8 @@ class BaseDocument(object):
if field.choices and isinstance(field.choices[0], (list, tuple)): if field.choices and isinstance(field.choices[0], (list, tuple)):
if value is None: if value is None:
return None return None
sep = getattr(field, 'display_sep', u' ') sep = getattr(field, 'display_sep', ' ')
values = value if field.__class__.__name__ == 'ListField' else [value] values = value if field.__class__.__name__ in ('ListField', 'SortedListField') else [value]
return sep.join([ return sep.join([
dict(field.choices).get(val, val) dict(field.choices).get(val, val)
for val in values or []]) for val in values or []])

6
tests/fields/fields.py
View File

@ -921,7 +921,7 @@ class FieldTest(MongoDBTestCase):
def test_list_validation(self): def test_list_validation(self):
"""Ensure that a list field only accepts lists with valid elements.""" """Ensure that a list field only accepts lists with valid elements."""
AccessLevelChoices = ( AccessLevelChoices = (
('a', u'Administrator'), ('a', u'Administration'),
('b', u'Manager'), ('b', u'Manager'),
('c', u'Staff'), ('c', u'Staff'),
) )
@ -938,7 +938,7 @@ class FieldTest(MongoDBTestCase):
tags = ListField(StringField()) tags = ListField(StringField())
authors = ListField(ReferenceField(User)) authors = ListField(ReferenceField(User))
generic = ListField(GenericReferenceField()) generic = ListField(GenericReferenceField())
access_list = ListField(required=False, default=[], choices=AccessLevelChoices, display_sep=u',') access_list = ListField(choices=AccessLevelChoices, display_sep=', ')
User.drop_collection() User.drop_collection()
BlogPost.drop_collection() BlogPost.drop_collection()
@ -965,7 +965,7 @@ class FieldTest(MongoDBTestCase):
post.access_list = ['a', 'b'] post.access_list = ['a', 'b']
post.validate() post.validate()
self.assertEqual(post.get_access_list_display(), u'Administrator,Manager') self.assertEqual(post.get_access_list_display(), u'Administration, Manager')
post.comments = ['a'] post.comments = ['a']
self.assertRaises(ValidationError, post.validate) self.assertRaises(ValidationError, post.validate)