From e97feffc5a6aa9e42d9db1c04d6755995452fed1 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 10 Aug 2016 16:01:09 +0100 Subject: [PATCH] .choices property of RelatedField should preserve non-string values. --- rest_framework/relations.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index ad74d1f35..264f6427a 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -10,7 +10,7 @@ from django.core.urlresolvers import ( from django.db.models import Manager from django.db.models.query import QuerySet from django.utils import six -from django.utils.encoding import smart_text +from django.utils.encoding import force_text, smart_text from django.utils.six.moves.urllib import parse as urlparse from django.utils.translation import ugettext_lazy as _ @@ -168,7 +168,7 @@ class RelatedField(Field): return OrderedDict([ ( - six.text_type(self.to_representation(item)), + force_text(self.to_representation(item), strings_only=True), self.display_value(item) ) for item in queryset