test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed a few more spots related to #11859. Thanks, cramm and Alex Gaynor. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12537 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Joseph Kocherhans 2010-02-23 18:27:51 +00:00
parent 0f1769555e
commit 7352238e16
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/db/models/fields/__init__.py
View File

@ -196,7 +196,7 @@ class Field(object):
return
if self._choices and value:
for option_key, option_value in self.choices:
if type(option_value) in (tuple, list):
if isinstance(option_value, (list, tuple)):
# This is an optgroup, so look inside the group for options.
for optgroup_key, optgroup_value in option_value:
if value == optgroup_key:
@ -431,7 +431,7 @@ class Field(object):
"""Flattened version of choices tuple."""
flat = []
for choice, value in self.choices:
if type(value) in (list, tuple):
if isinstance(value, (list, tuple)):
flat.extend(value)
else:
flat.append((choice,value))

2
django/forms/fields.py
View File

@ -621,7 +621,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):