diff options
| author | Tom Christie | 2014-11-18 15:42:52 +0000 |
|---|---|---|
| committer | Tom Christie | 2014-11-18 15:42:52 +0000 |
| commit | c0d356edaa425868dbcdb29c5d2f8e88f177f604 (patch) | |
| tree | 470df963158b8e654ce0303cb76c4f5f31805e36 /rest_framework/metadata.py | |
| parent | 080bd3d24e1866df2acc3aae0ec0f97ebe3a8c36 (diff) | |
| download | django-rest-framework-c0d356edaa425868dbcdb29c5d2f8e88f177f604.tar.bz2 | |
Fix byte decode error rendering 'display_name' with OPTIONS. Closes #2084
Diffstat (limited to 'rest_framework/metadata.py')
| -rw-r--r-- | rest_framework/metadata.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/rest_framework/metadata.py b/rest_framework/metadata.py index 90d3f2e0..de829d00 100644 --- a/rest_framework/metadata.py +++ b/rest_framework/metadata.py @@ -121,7 +121,10 @@ class SimpleMetadata(BaseMetadata): if hasattr(field, 'choices'): field_info['choices'] = [ - {'value': choice_value, 'display_name': choice_name} + { + 'value': choice_value, + 'display_name': force_text(choice_name, strings_only=True) + } for choice_value, choice_name in field.choices.items() ] |