diff options
| author | Tom Christie | 2012-11-01 06:27:28 -0700 |
|---|---|---|
| committer | Tom Christie | 2012-11-01 06:27:28 -0700 |
| commit | 5558c0530fcdbf9384ea4ebdccd3a2f24c264d5e (patch) | |
| tree | 648f532995594530c9571cc37d801b23499fa64f | |
| parent | aa779598aa4e979633c25b5deef69547c67d4302 (diff) | |
| parent | d3aedd5fb1d8c50e9b7047469163dc75ac3de022 (diff) | |
| download | django-rest-framework-5558c0530fcdbf9384ea4ebdccd3a2f24c264d5e.tar.bz2 | |
Merge pull request #351 from asfaltboy/fix_trans_choices
Return choices as unicode and not string
| -rw-r--r-- | rest_framework/renderers.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 8dff0c77..fd6f9499 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -100,7 +100,7 @@ class JSONPRenderer(JSONRenderer): callback = self.get_callback(renderer_context) json = super(JSONPRenderer, self).render(data, accepted_media_type, renderer_context) - return "%s(%s);" % (callback, json) + return u"%s(%s);" % (callback, json) class XMLRenderer(BaseRenderer): @@ -306,7 +306,7 @@ class BrowsableAPIRenderer(BaseRenderer): if getattr(widget, 'choices', None): choices = widget.choices if any([ident != desc for (ident, desc) in choices]): - choices = [(ident, "%s (%s)" % (desc, ident)) + choices = [(ident, u"%s (%s)" % (desc, ident)) for (ident, desc) in choices] widget.choices = choices kwargs['widget'] = widget |