Commit b7edd463 by David Sanders

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

parent 8e84a9f6
...@@ -1042,16 +1042,10 @@ class ChoiceField(Field): ...@@ -1042,16 +1042,10 @@ class ChoiceField(Field):
except KeyError: except KeyError:
self.fail('invalid_choice', input=data) 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): def to_representation(self, value):
if value in ('', None): if value in ('', None):
return value return value
return self.representation_value(value) return self.choice_strings_to_values.get(six.text_type(value), value)
class MultipleChoiceField(ChoiceField): class MultipleChoiceField(ChoiceField):
...@@ -1079,7 +1073,7 @@ class MultipleChoiceField(ChoiceField): ...@@ -1079,7 +1073,7 @@ class MultipleChoiceField(ChoiceField):
def to_representation(self, value): def to_representation(self, value):
return set([ 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
]) ])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment