Skip to content

Allow unexpected values for ChoiceField/MultipleChoiceField representations #2940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lovelydinosaur merged 2 commits into from
May 15, 2015
Merged

Allow unexpected values for ChoiceField/MultipleChoiceField representations #2940

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e84a9f
Allow invalid outputs to pass through to_representation() for ChoiceF…
May 15, 2015
b7edd46
Use simpler dict.get() rather than try/except
May 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Use simpler dict.get() rather than try/except
  • Loading branch information
David Sanders committed May 15, 2015
commit b7edd463139a02ccad268bc6c9f8a17d02641421
10 changes: 2 additions & 8 deletions rest_framework/fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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
])


Expand Down