From b5454dd02290130a7fb0a0e375f3efecc58edc6d Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Mon, 22 Sep 2014 16:50:04 +0100
Subject: Tests and tweaks for choice fields

---
 rest_framework/fields.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'rest_framework/fields.py')

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 12975ae4..500018f3 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -750,7 +750,7 @@ class ChoiceField(Field):
             self.fail('invalid_choice', input=data)
 
     def to_representation(self, value):
-        return value
+        return self.choice_strings_to_values[str(value)]
 
 
 class MultipleChoiceField(ChoiceField):
@@ -769,7 +769,7 @@ class MultipleChoiceField(ChoiceField):
         ])
 
     def to_representation(self, value):
-        return value
+        return [self.choice_strings_to_values[str(item)] for item in value]
 
 
 # File types...
-- 
cgit v1.2.3