.choices property of RelatedField should preserve non-string values. (#4379)

tomchristie · web-flow · commit f1a2eeb81836 · 2016-08-10T16:38:59.000+01:00
Update RelatedField.choices to support non-string values
diff --git a/rest_framework/relations.py b/rest_framework/relations.py
@@ -168,7 +168,7 @@ def get_choices(self, cutoff=None):
 
         return OrderedDict([
             (
-                six.text_type(self.to_representation(item)),
+                self.to_representation(item),
                 self.display_value(item)
             )
             for item in queryset
diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py
@@ -614,7 +614,7 @@ class Meta:
                 fields = '__all__'
 
         serializer = TestSerializer()
-        expected = OrderedDict([('1', 'Red Color'), ('2', 'Yellow Color'), ('3', 'Green Color')])
+        expected = OrderedDict([(1, 'Red Color'), (2, 'Yellow Color'), (3, 'Green Color')])
         self.assertEqual(serializer.fields['color'].choices, expected)
 
     def test_custom_display_value(self):
@@ -630,7 +630,7 @@ class Meta:
                 fields = '__all__'
 
         serializer = TestSerializer()
-        expected = OrderedDict([('1', 'My Red Color'), ('2', 'My Yellow Color'), ('3', 'My Green Color')])
+        expected = OrderedDict([(1, 'My Red Color'), (2, 'My Yellow Color'), (3, 'My Green Color')])
         self.assertEqual(serializer.fields['color'].choices, expected)
 
 

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ def get_choices(self, cutoff=None):`
`168`	`168`
`169`	`169`	`return OrderedDict([`
`170`	`170`	`(`
`171`		`- six.text_type(self.to_representation(item)),`
	`171`	`+ self.to_representation(item),`
`172`	`172`	`self.display_value(item)`
`173`	`173`	`)`
`174`	`174`	`for item in queryset`