test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #9384 -- Fixed a couple of typos. Thanks, Thomas Güttler and romke. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9255 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2008-10-24 07:14:30 +00:00
parent 3b5d975ff6
commit 92a6c14291
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
django/forms/fields.py
View File

@ -667,7 +667,7 @@ class TypedChoiceField(ChoiceField):
self.coerce = kwargs.pop('coerce', lambda val: val) self.coerce = kwargs.pop('coerce', lambda val: val)
self.empty_value = kwargs.pop('empty_value', '') self.empty_value = kwargs.pop('empty_value', '')
super(TypedChoiceField, self).__init__(*args, **kwargs) super(TypedChoiceField, self).__init__(*args, **kwargs)
def clean(self, value): def clean(self, value):
""" """
Validate that the value is in self.choices and can be coerced to the Validate that the value is in self.choices and can be coerced to the
@ -676,12 +676,12 @@ class TypedChoiceField(ChoiceField):
value = super(TypedChoiceField, self).clean(value) value = super(TypedChoiceField, self).clean(value)
if value == self.empty_value or value in EMPTY_VALUES: if value == self.empty_value or value in EMPTY_VALUES:
return self.empty_value return self.empty_value
# Hack alert: This field is purpose-made to use with Field.to_python as # Hack alert: This field is purpose-made to use with Field.to_python as
# a coercion function so that ModelForms with choices work. However, # a coercion function so that ModelForms with choices work. However,
# Django's Field.to_python raises django.core.exceptions.ValidationError, # Django's Field.to_python raises
# which is a *different* exception than # django.core.exceptions.ValidationError, which is a *different*
# django.forms.utils.ValidationError. So unfortunatly we need to catch # exception than django.forms.util.ValidationError. So we need to catch
# both. # both.
try: try:
value = self.coerce(value) value = self.coerce(value)

4
docs/ref/forms/validation.txt
View File

@ -100,10 +100,10 @@ through the ``Form.non_field_errors()`` method.
When you really do need to attach the error to a particular field, you should When you really do need to attach the error to a particular field, you should
store (or amend) a key in the `Form._errors` attribute. This attribute is an store (or amend) a key in the `Form._errors` attribute. This attribute is an
instance of a ``django.form.utils.ErrorDict`` class. Essentially, though, it's instance of a ``django.forms.util.ErrorDict`` class. Essentially, though, it's
just a dictionary. There is a key in the dictionary for each field in the form just a dictionary. There is a key in the dictionary for each field in the form
that has an error. Each value in the dictionary is a that has an error. Each value in the dictionary is a
``django.form.utils.ErrorList`` instance, which is a list that knows how to ``django.forms.util.ErrorList`` instance, which is a list that knows how to
display itself in different ways. So you can treat `_errors` as a dictionary display itself in different ways. So you can treat `_errors` as a dictionary
mapping field names to lists. mapping field names to lists.