summaryrefslogtreecommitdiff
path: root/django/forms/widgets.py
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:24:05 +0200
commite487ffd3f0f9931e7c18bfbd47cf1e6b059ddc41 (patch)
tree9e489b25a1b34e65357b3333465ecce52de6026e /django/forms/widgets.py
parent6b3724fa1116c0949a6e0cd3e0dd55959a3abd93 (diff)
Fixed #27866 -- Made ChoiceWidget.format_value() return a list
Thanks Tim Graham for the review.
Diffstat (limited to 'django/forms/widgets.py')
-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 2e58d449c4..bb200dcc87 100644
--- a/django/forms/widgets.py
+++ b/django/forms/widgets.py
@@ -628,16 +628,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):