diff options
| author | Joseph Kocherhans <joseph@jkocherhans.com> | 2010-02-23 18:40:07 +0000 |
|---|---|---|
| committer | Joseph Kocherhans <joseph@jkocherhans.com> | 2010-02-23 18:40:07 +0000 |
| commit | ae01b0c5cb86ba68a0eeaac87b31206d9a4023bf (patch) | |
| tree | 446daddd27eb545a4b81d06152c54677426cc8bb /django/forms | |
| parent | a599e50b07cb9ec64ebc06a7fdb7b47ed7d762bb (diff) | |
[1.1.X] Fixed a few more spots related to #11859. Backport of r12537 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12538 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/forms')
| -rw-r--r-- | django/forms/fields.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/forms/fields.py b/django/forms/fields.py index 581d32d923..18174360f6 100644 --- a/django/forms/fields.py +++ b/django/forms/fields.py @@ -660,7 +660,7 @@ class ChoiceField(Field): def valid_value(self, value): "Check to see if the provided value is a valid choice" for k, v in self.choices: - if type(v) in (tuple, list): + if isinstance(v, (list, tuple)): # This is an optgroup, so look inside the group for options for k2, v2 in v: if value == smart_unicode(k2): |