summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--django/newforms/fields.py2
-rw-r--r--docs/newforms.txt8
2 files changed, 9 insertions, 1 deletions
diff --git a/django/newforms/fields.py b/django/newforms/fields.py
index d676a1c58b..fada75fe5d 100644
--- a/django/newforms/fields.py
+++ b/django/newforms/fields.py
@@ -277,7 +277,7 @@ class MultipleChoiceField(ChoiceField):
val = smart_unicode(val)
new_value.append(val)
# Validate that each value in the value list is in self.choices.
- valid_values = set([k for k, v in self.choices])
+ valid_values = set([smart_unicode(k) for k, v in self.choices])
for val in new_value:
if val not in valid_values:
raise ValidationError(gettext(u'Select a valid choice. %s is not one of the available choices.') % val)
diff --git a/docs/newforms.txt b/docs/newforms.txt
index f796477a9e..9bfbc75ee7 100644
--- a/docs/newforms.txt
+++ b/docs/newforms.txt
@@ -62,6 +62,14 @@ The library deals with these concepts:
* **Form** -- A collection of fields that knows how to validate itself and
display itself as HTML.
+
+
+Using forms with templates
+==========================
+
+Using forms in views
+====================
+
More coming soon
================