Skip to content

Commit 820b5cb

Browse files
author
Bo.Yi
committed
[fix]pass test case and fix field type error
1 parent e6a30f8 commit 820b5cb

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

mongoengine/base/document.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1080,9 +1080,11 @@ def __get_field_display(self, field):
10801080
"""Return the display value for a choice field"""
10811081
value = getattr(self, field.name)
10821082
if field.choices and isinstance(field.choices[0], (list, tuple)):
1083+
if value is None:
1084+
return None
10831085
sep = getattr(field, 'display_sep', u' ')
1084-
values = value if field.__name__ == 'ListField' else [value]
1086+
values = value if field.__class__.__name__ == 'ListField' else [value]
10851087
return sep.join([
10861088
dict(field.choices).get(val, val)
1087-
for val in values])
1089+
for val in values or []])
10881090
return value

tests/fields/fields.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -957,10 +957,10 @@ class BlogPost(Document):
957957
post.validate()
958958

959959
post.access_list = 'a,b'
960-
self.assertRaises(ValidationError, post.validate())
960+
self.assertRaises(ValidationError, post.validate)
961961

962962
post.access_list = ['c', 'd']
963-
self.assertRaises(ValidationError, post.validate())
963+
self.assertRaises(ValidationError, post.validate)
964964

965965
post.access_list = ['a', 'b']
966966
post.validate()

0 commit comments

Comments
 (0)