Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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
  • Loading branch information...
commit 7352238e16110c139031b01343379596830c48a3 1 parent 0f17695
@jkocherhans jkocherhans authored
Showing with 3 additions and 3 deletions.
  1. +2 −2 django/db/models/fields/__init__.py
  2. +1 −1  django/forms/fields.py
View
4 django/db/models/fields/__init__.py
@@ -196,7 +196,7 @@ def validate(self, value, model_instance):
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 @@ def _get_flatchoices(self):
"""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))
View
2  django/forms/fields.py
@@ -621,7 +621,7 @@ def validate(self, value):
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):
Please sign in to comment.
Something went wrong with that request. Please try again.