p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed unused Field.get_flatchoices() method. 

Unused since c2ba59fc1d (Django 1.0).

Thanks Andy Baker for the report.
This commit is contained in:
Tim Graham 2015-08-03 08:42:08 -04:00
parent 8972818289
commit 770449e24b
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -826,14 +826,6 @@ class Field(RegisterLookupMixin):
def get_choices_default(self): def get_choices_default(self):
return self.get_choices() 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( @warn_about_renamed_method(
'Field', '_get_val_from_obj', 'value_from_object', 'Field', '_get_val_from_obj', 'value_from_object',
RemovedInDjango20Warning RemovedInDjango20Warning

4
tests/model_fields/tests.py
View File

@ -480,8 +480,8 @@ class BooleanFieldTests(test.TestCase):
class ChoicesTests(test.SimpleTestCase): class ChoicesTests(test.SimpleTestCase):
def test_choices_and_field_display(self): def test_choices_and_field_display(self):
""" """
Check that get_choices and get_flatchoices interact with Check that get_choices() interacts with get_FIELD_display() to return
get_FIELD_display to return the expected values (#7913). the expected values (#7913).
""" """
self.assertEqual(Whiz(c=1).get_c_display(), 'First') # A nested value 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 self.assertEqual(Whiz(c=0).get_c_display(), 'Other') # A top level value