Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.0.X] Fixed #9384 -- Fixed a couple of typos. Thanks, Thomas Güttle…

…r and romke.

Backport of r9255 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9259 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 73ea785d6b6a26fe16145c962fa5b9f00c428d19 1 parent 6c85612
@malcolmt malcolmt authored
Showing with 7 additions and 7 deletions.
  1. +5 −5 django/forms/fields.py
  2. +2 −2 docs/ref/forms/validation.txt
View
10 django/forms/fields.py
@@ -667,7 +667,7 @@ def __init__(self, *args, **kwargs):
self.coerce = kwargs.pop('coerce', lambda val: val)
self.empty_value = kwargs.pop('empty_value', '')
super(TypedChoiceField, self).__init__(*args, **kwargs)
-
+
def clean(self, value):
"""
Validate that the value is in self.choices and can be coerced to the
@@ -676,12 +676,12 @@ def clean(self, value):
value = super(TypedChoiceField, self).clean(value)
if value == self.empty_value or value in EMPTY_VALUES:
return self.empty_value
-
+
# Hack alert: This field is purpose-made to use with Field.to_python as
# a coercion function so that ModelForms with choices work. However,
- # Django's Field.to_python raises django.core.exceptions.ValidationError,
- # which is a *different* exception than
- # django.forms.utils.ValidationError. So unfortunatly we need to catch
+ # Django's Field.to_python raises
+ # django.core.exceptions.ValidationError, which is a *different*
+ # exception than django.forms.util.ValidationError. So we need to catch
# both.
try:
value = self.coerce(value)
View
4 docs/ref/forms/validation.txt
@@ -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
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
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
mapping field names to lists.
Please sign in to comment.
Something went wrong with that request. Please try again.