From a38d9d5b24501ae0e279c9afbea08e423112ba34 Mon Sep 17 00:00:00 2001
From: Ian Foote <ian@incuna.com>
Date: Tue, 26 Nov 2013 09:33:47 +0000
Subject: [PATCH 1/3] Add choices to options metadata for ChoiceField.

---
 rest_framework/fields.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 6c07dbb3b..80eff66c4 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -514,6 +514,11 @@ class ChoiceField(WritableField):
 
     choices = property(_get_choices, _set_choices)
 
+    def metadata(self):
+        data = super(ChoiceField, self).metadata()
+        data['choices'] = self.choices
+        return data
+
     def validate(self, value):
         """
         Validates that the input is in self.choices.

From 2484fc914159571a3867c2dae2d9b51314f4581d Mon Sep 17 00:00:00 2001
From: Ian Foote <ian@incuna.com>
Date: Tue, 26 Nov 2013 17:10:16 +0000
Subject: [PATCH 2/3] Add more context to the ChoiceField metadata.

---
 rest_framework/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 80eff66c4..1657e57f3 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -516,7 +516,7 @@ class ChoiceField(WritableField):
 
     def metadata(self):
         data = super(ChoiceField, self).metadata()
-        data['choices'] = self.choices
+        data['choices'] = [{'value': v, 'name': n} for v, n in self.choices]
         return data
 
     def validate(self, value):

From 8d09f56061a3ee82e31fb646cfa84484ae525f88 Mon Sep 17 00:00:00 2001
From: Ian Foote <ian@incuna.com>
Date: Wed, 27 Nov 2013 11:00:15 +0000
Subject: [PATCH 3/3] Add unittests for ChoiceField metadata.

Rename 'name' to 'display_name'.
---
 rest_framework/fields.py            |  2 +-
 rest_framework/tests/test_fields.py | 26 ++++++++++++++++++++++----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 1657e57f3..0fca718e7 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -516,7 +516,7 @@ class ChoiceField(WritableField):
 
     def metadata(self):
         data = super(ChoiceField, self).metadata()
-        data['choices'] = [{'value': v, 'name': n} for v, n in self.choices]
+        data['choices'] = [{'value': v, 'display_name': n} for v, n in self.choices]
         return data
 
     def validate(self, value):
diff --git a/rest_framework/tests/test_fields.py b/rest_framework/tests/test_fields.py
index ab2cceacd..5c96bce92 100644
--- a/rest_framework/tests/test_fields.py
+++ b/rest_framework/tests/test_fields.py
@@ -707,20 +707,21 @@ class ChoiceFieldTests(TestCase):
         self.assertEqual(f.choices, models.fields.BLANK_CHOICE_DASH + SAMPLE_CHOICES)
 
     def test_invalid_choice_model(self):
-        s = ChoiceFieldModelSerializer(data={'choice' : 'wrong_value'})
+        s = ChoiceFieldModelSerializer(data={'choice': 'wrong_value'})
         self.assertFalse(s.is_valid())
         self.assertEqual(s.errors,  {'choice': ['Select a valid choice. wrong_value is not one of the available choices.']})
         self.assertEqual(s.data['choice'], '')
 
     def test_empty_choice_model(self):
         """
-        Test that the 'empty' value is correctly passed and used depending on the 'null' property on the model field.
+        Test that the 'empty' value is correctly passed and used depending on
+        the 'null' property on the model field.
         """
-        s = ChoiceFieldModelSerializer(data={'choice' : ''})
+        s = ChoiceFieldModelSerializer(data={'choice': ''})
         self.assertTrue(s.is_valid())
         self.assertEqual(s.data['choice'], '')
 
-        s = ChoiceFieldModelWithNullSerializer(data={'choice' : ''})
+        s = ChoiceFieldModelWithNullSerializer(data={'choice': ''})
         self.assertTrue(s.is_valid())
         self.assertEqual(s.data['choice'], None)
 
@@ -740,6 +741,23 @@ class ChoiceFieldTests(TestCase):
         self.assertEqual(f.from_native(''), None)
         self.assertEqual(f.from_native(None), None)
 
+    def test_metadata_choices(self):
+        """
+        Make sure proper choices are included in the field's metadata.
+        """
+        choices = [{'value': v, 'display_name': n} for v, n in SAMPLE_CHOICES]
+        f = serializers.ChoiceField(choices=SAMPLE_CHOICES)
+        self.assertEqual(f.metadata()['choices'], choices)
+
+    def test_metadata_choices_not_required(self):
+        """
+        Make sure proper choices are included in the field's metadata.
+        """
+        choices = [{'value': v, 'display_name': n}
+                   for v, n in models.fields.BLANK_CHOICE_DASH + SAMPLE_CHOICES]
+        f = serializers.ChoiceField(required=False, choices=SAMPLE_CHOICES)
+        self.assertEqual(f.metadata()['choices'], choices)
+
 
 class EmailFieldTests(TestCase):
     """