encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-23 01:57:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
David Sanders 2015-05-16 01:01:27 +10:00
parent 8e84a9f6d0
commit b7edd46313
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rest_framework/fields.py
View File

@ -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):
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
]) ])