Browse files

[1.1.X] Fixed #11859. Allowed subclasses of tuple or list for choice …

…options. Backport of r12535 from trunk.

git-svn-id: bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 6510822 commit a599e50b07cb9ec64ebc06a7fdb7b47ed7d762bb @jkocherhans jkocherhans committed Feb 23, 2010
Showing with 1 addition and 1 deletion.
  1. +1 −1 django/core/management/
@@ -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).' %
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.' %
if f.db_index not in (None, True, False):
e.add(opts, '"%s": "db_index" should be either None, True or False.' %

0 comments on commit a599e50

Please sign in to comment.