Skip to content

Commit

Permalink
Fixed #11859. Allowed subclasses of tuple or list for choice options.…
Browse files Browse the repository at this point in the history
… Thanks, Alex Gaynor.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12535 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
jkocherhans committed Feb 23, 2010
1 parent f2d5582 commit 0f17695
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion django/core/management/validation.py
Expand Up @@ -62,7 +62,7 @@ def get_validation_errors(outfile, app=None):
e.add(opts, '"%s": "choices" should be iterable (e.g., a tuple or list).' % f.name) e.add(opts, '"%s": "choices" should be iterable (e.g., a tuple or list).' % f.name)
else: else:
for c in f.choices: for c in f.choices:
if not type(c) in (tuple, list) or len(c) != 2: if not isinstance(c, (list, tuple)) or len(c) != 2:
e.add(opts, '"%s": "choices" should be a sequence of two-tuples.' % f.name) e.add(opts, '"%s": "choices" should be a sequence of two-tuples.' % f.name)
if f.db_index not in (None, True, False): if f.db_index not in (None, True, False):
e.add(opts, '"%s": "db_index" should be either None, True or False.' % f.name) e.add(opts, '"%s": "db_index" should be either None, True or False.' % f.name)
Expand Down

0 comments on commit 0f17695

Please sign in to comment.