summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2008-07-29 21:43:07 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2008-07-29 21:43:07 +0000
commita14fc40041b28dd4aa07bd1ffca8a0189ac5fb5f (patch)
tree1b61babf0fafe7d27d2c91c4379fb3aab75696d2
parentb69b15fe02c47a754ab117dd4b5957eabe05c1ca (diff)
Fixed #7913 -- Corrected ham-fisted typo from [8102]. Thanks to evinrik for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8139 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/db/models/fields/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index 6f914f5f36..157c40e832 100644
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -385,7 +385,7 @@ class Field(object):
def get_flatchoices(self, include_blank=True, blank_choice=BLANK_CHOICE_DASH):
"Returns flattened choices with a default blank choice included."
first_choice = include_blank and blank_choice or []
- return first_choices + list(self.flatchoices)
+ return first_choice + list(self.flatchoices)
def _get_val_from_obj(self, obj):
if obj: