From 770449e24b3b0fa60d870bc3404961ddca754c3b Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Mon, 3 Aug 2015 08:42:08 -0400 Subject: [PATCH] Removed unused Field.get_flatchoices() method. Unused since c2ba59fc1da5287d6286e2c2aca4083d5bafe056 (Django 1.0). Thanks Andy Baker for the report. --- django/db/models/fields/__init__.py | 8 -------- tests/model_fields/tests.py | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py index 803ba7ca9a..fe5ff6704f 100644 --- a/django/db/models/fields/__init__.py +++ b/django/db/models/fields/__init__.py @@ -826,14 +826,6 @@ class Field(RegisterLookupMixin): def get_choices_default(self): return self.get_choices() - def get_flatchoices(self, include_blank=True, - blank_choice=BLANK_CHOICE_DASH): - """ - Returns flattened choices with a default blank choice included. - """ - first_choice = blank_choice if include_blank else [] - return first_choice + list(self.flatchoices) - @warn_about_renamed_method( 'Field', '_get_val_from_obj', 'value_from_object', RemovedInDjango20Warning diff --git a/tests/model_fields/tests.py b/tests/model_fields/tests.py index 128bdb25af..bc183ba431 100644 --- a/tests/model_fields/tests.py +++ b/tests/model_fields/tests.py @@ -480,8 +480,8 @@ class BooleanFieldTests(test.TestCase): class ChoicesTests(test.SimpleTestCase): def test_choices_and_field_display(self): """ - Check that get_choices and get_flatchoices interact with - get_FIELD_display to return the expected values (#7913). + Check that get_choices() interacts with get_FIELD_display() to return + the expected values (#7913). """ self.assertEqual(Whiz(c=1).get_c_display(), 'First') # A nested value self.assertEqual(Whiz(c=0).get_c_display(), 'Other') # A top level value