summaryrefslogtreecommitdiff
path: root/django/forms
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2017-02-21 13:27:29 +0100
committerClaude Paroz <claude@2xlibre.net>2017-04-01 12:26:49 +0200
commit06d32f689eb218bee633125dd0afa68400311885 (patch)
treed8cb8403b49d795c24cfe0126f902eb0927745b9 /django/forms
parentff0c6b83e590e36555639563c4bd1d808f416455 (diff)
[1.11.x] Fixed #27866 -- Made ChoiceWidget.format_value() return a list
Thanks Tim Graham for the review. Backport of e487ffd3f0f9931e7c18bfbd47cf1e6b059ddc41 from master.
Diffstat (limited to 'django/forms')
-rw-r--r--django/forms/widgets.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/django/forms/widgets.py b/django/forms/widgets.py
index 7e4206a00b..fe30139ac8 100644
--- a/django/forms/widgets.py
+++ b/django/forms/widgets.py
@@ -647,16 +647,10 @@ class ChoiceWidget(Widget):
return getter(name)
def format_value(self, value):
- """Return selected values as a set."""
+ """Return selected values as a list."""
if not isinstance(value, (tuple, list)):
value = [value]
- values = set()
- for v in value:
- if v is None:
- values.add('')
- else:
- values.add(force_text(v))
- return values
+ return [str(v) if v is not None else '' for v in value]
class Select(ChoiceWidget):