Use simpler dict.get() rather than try/except

Author: David Sanders

rest_framework/fields.py

@@ -1042,16 +1042,10 @@ def to_internal_value(self, data):
         except KeyError:
             self.fail('invalid_choice', input=data)
 
-    def representation_value(self, value):
-        try:
-            return self.choice_strings_to_values[six.text_type(value)]
-        except KeyError:
-            return value
-
     def to_representation(self, value):
         if value in ('', None):
             return value
-        return self.representation_value(value)
+        return self.choice_strings_to_values.get(six.text_type(value), value)
 
 
 class MultipleChoiceField(ChoiceField):
@@ -1079,7 +1073,7 @@ def to_internal_value(self, data):
 
     def to_representation(self, value):
         return set([
-            self.representation_value(item) for item in value
+            self.choice_strings_to_values.get(six.text_type(item), item) for item in value
         ])