summaryrefslogtreecommitdiff
path: root/docs/ref/forms
diff options
context:
space:
mode:
Diffstat (limited to 'docs/ref/forms')
-rw-r--r--docs/ref/forms/fields.txt14
1 files changed, 10 insertions, 4 deletions
diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt
index d7fcef2e75..070ccdf7a8 100644
--- a/docs/ref/forms/fields.txt
+++ b/docs/ref/forms/fields.txt
@@ -387,10 +387,16 @@ For each field, we describe the default widget used if you don't specify
.. attribute:: choices
- An iterable (e.g., a list or tuple) of 2-tuples to use as choices for this
- field. This argument accepts the same formats as the ``choices`` argument
- to a model field. See the :ref:`model field reference documentation on
- choices <field-choices>` for more details.
+ Either an iterable (e.g., a list or tuple) of 2-tuples to use as
+ choices for this field, or a callable that returns such an iterable.
+ This argument accepts the same formats as the ``choices`` argument to a
+ model field. See the :ref:`model field reference documentation on
+ choices <field-choices>` for more details. If the argument is a
+ callable, it is evaluated each time the field's form is initialized.
+
+ .. versionchanged:: 1.8
+
+ The ability to pass a callable to ``choices`` was added.
``TypedChoiceField``
~~~~~~~~~~~~~~~~~~~~