summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2013-01-30 13:29:56 -0800
committerClaude Paroz <claude@2xlibre.net>2013-01-30 13:29:56 -0800
commit5b4805ae2bbc14b159e3bfd84e78eb9189ffa6eb (patch)
tree5ea8f7172b741568d4c2bc62dca829d162d58ab2
parent3895ebc734c2b3be13d77cdd080b4a76bd4c36e9 (diff)
parent52533a64d5866a3586dbfba69c6cb9e39bff7466 (diff)
Merge pull request #686 from skrr/ticket_19703
Fixed #19703 -- Typo in get_declared_fields docstring
-rw-r--r--django/forms/forms.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/forms/forms.py b/django/forms/forms.py
index 9c5dc3eb5c..dccb12657e 100644
--- a/django/forms/forms.py
+++ b/django/forms/forms.py
@@ -32,12 +32,12 @@ def get_declared_fields(bases, attrs, with_base_fields=True):
"""
Create a list of form field instances from the passed in 'attrs', plus any
similar fields on the base classes (in 'bases'). This is used by both the
- Form and ModelForm metclasses.
+ Form and ModelForm metaclasses.
If 'with_base_fields' is True, all fields from the bases are used.
Otherwise, only fields in the 'declared_fields' attribute on the bases are
used. The distinction is useful in ModelForm subclassing.
- Also integrates any additional media definitions
+ Also integrates any additional media definitions.
"""
fields = [(field_name, attrs.pop(field_name)) for field_name, obj in list(six.iteritems(attrs)) if isinstance(obj, Field)]
fields.sort(key=lambda x: x[1].creation_counter)