Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[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
  • Loading branch information...
commit ae01b0c5cb86ba68a0eeaac87b31206d9a4023bf 1 parent a599e50
@jkocherhans jkocherhans authored
Showing with 2 additions and 2 deletions.
  1. +1 −1  django/db/models/fields/__init__.py
  2. +1 −1  django/forms/fields.py
View
2  django/db/models/fields/__init__.py
@@ -304,7 +304,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
@@ -660,7 +660,7 @@ def clean(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.