Commit a19e9d80 authored by Donald Stufft's avatar Donald Stufft
Browse files

Fixed #20430 - Enable iterable of iterables for model choices 

Allows for any iterable, not just lists or tuples, to be used as
the inner item for a list of choices in a model.
parent a0c0cc92

django/core/management/validation.py

+2 −2
Original line number Diff line number Diff line
@@ -118,8 +118,8 @@ def get_validation_errors(outfile, app=None): 
                    e.add(opts, '"%s": "choices" should be iterable (e.g., a tuple or list).' % f.name)

                else:

                    for c in f.choices:

                        if not isinstance(c, (list, tuple)) or len(c) != 2:

                            e.add(opts, '"%s": "choices" should be a sequence of two-tuples.' % f.name)

                        if isinstance(c, six.string_types) or not is_iterable(c) or len(c) != 2:

                            e.add(opts, '"%s": "choices" should be a sequence of two-item iterables (e.g. list of 2 item tuples).' % f.name)

            if f.db_index not in (None, True, False):

                e.add(opts, '"%s": "db_index" should be either None, True or False.' % f.name)

docs/ref/models/fields.txt

+4 −3
Original line number Diff line number Diff line
@@ -80,9 +80,10 @@ If a field has ``blank=False``, the field will be required. 


.. attribute:: Field.choices



An iterable (e.g., a list or tuple) of 2-tuples to use as choices for this

field. If this is given, the default form widget will be a select box with

these choices instead of the standard text field.

An iterable (e.g., a list or tuple) consisting itself of iterables of exactly

two items (e.g. ``[(A, B), (A, B) ...]``) to use as choices for this field. If

this is given, the default form widget will be a select box with these choices

instead of the standard text field.



The first element in each tuple is the actual value to be stored, and the

second element is the human-readable name. For example::

docs/releases/1.6.txt

+3 −0
Original line number Diff line number Diff line
@@ -238,6 +238,9 @@ Minor features 
  Meta option: ``localized_fields``. Fields included in this list will be localized

  (by setting ``localize`` on the form field).



* The ``choices`` argument to model fields now accepts an iterable of iterables

  instead of requiring an iterable of lists or tuples.



Backwards incompatible changes in 1.6

=====================================

tests/invalid_models/invalid_models/models.py

+2 −2
Original line number Diff line number Diff line
@@ -375,8 +375,8 @@ invalid_models.fielderrors: "decimalfield3": DecimalFields require a "max_digits 
invalid_models.fielderrors: "decimalfield4": DecimalFields require a "max_digits" attribute value that is greater than or equal to the value of the "decimal_places" attribute.

invalid_models.fielderrors: "filefield": FileFields require an "upload_to" attribute.

invalid_models.fielderrors: "choices": "choices" should be iterable (e.g., a tuple or list).

invalid_models.fielderrors: "choices2": "choices" should be a sequence of two-tuples.

invalid_models.fielderrors: "choices2": "choices" should be a sequence of two-tuples.

invalid_models.fielderrors: "choices2": "choices" should be a sequence of two-item iterables (e.g. list of 2 item tuples).

invalid_models.fielderrors: "choices2": "choices" should be a sequence of two-item iterables (e.g. list of 2 item tuples).

invalid_models.fielderrors: "index": "db_index" should be either None, True or False.

invalid_models.fielderrors: "field_": Field names cannot end with underscores, because this would lead to ambiguous queryset filters.

invalid_models.fielderrors: "nullbool": BooleanFields do not accept null values. Use a NullBooleanField instead.

tests/model_validation/__init__.py

0 → 100644
+0 −0

Empty file added.