From c0d356edaa425868dbcdb29c5d2f8e88f177f604 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Tue, 18 Nov 2014 15:42:52 +0000
Subject: [PATCH] Fix byte decode error rendering 'display_name' with OPTIONS.
 Closes #2084

---
 rest_framework/metadata.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rest_framework/metadata.py b/rest_framework/metadata.py
index 90d3f2e01..de829d003 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()
             ]