Commit a599e50b authored by Joseph Kocherhans's avatar Joseph Kocherhans
Browse files

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

[1.1.X] Fixed #11859. Allowed subclasses of tuple or list for choice options. Backport of r12535 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12536 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 65108226

django/core/management/validation.py

+1 −1
Original line number Diff line number Diff line
@@ -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)

                else:

                    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)

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

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