diff options
| author | Tom Christie | 2014-11-19 14:04:31 +0000 |
|---|---|---|
| committer | Tom Christie | 2014-11-19 14:04:31 +0000 |
| commit | bc83dfece460b6639d915bd8fb42b3701cd91172 (patch) | |
| tree | 7616b21fd6d02caef557be43a12e8d7979ee4997 /rest_framework/fields.py | |
| parent | f269826a7d8a980536ffbce369be369c4df58d23 (diff) | |
| parent | 51b7033e4aeeefe19012a77b09a0b23d4a52a5bc (diff) | |
| download | django-rest-framework-bc83dfece460b6639d915bd8fb42b3701cd91172.tar.bz2 | |
Merge branch 'master' into 3.0-beta
Diffstat (limited to 'rest_framework/fields.py')
| -rw-r--r-- | rest_framework/fields.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 36afe7a9..bb43708d 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -947,6 +947,8 @@ class ChoiceField(Field): self.fail('invalid_choice', input=data) def to_representation(self, value): + if value in ('', None): + return value return self.choice_strings_to_values[six.text_type(value)] |