aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/renderers.py
diff options
context:
space:
mode:
authorTom Christie2012-11-01 23:11:28 +0000
committerTom Christie2012-11-01 23:11:28 +0000
commit36e21153fbc60579c49e46c3f6488ff7bcb1f6ff (patch)
tree86097abd5482538c7c026dd233566026b6e6bcad /rest_framework/renderers.py
parentd327c5f531b341ad980d20454211b02b87f34d0e (diff)
parent600289a8153eb70542551bab00d59fb7ff0065f0 (diff)
downloaddjango-rest-framework-36e21153fbc60579c49e46c3f6488ff7bcb1f6ff.tar.bz2
Merge master
Diffstat (limited to 'rest_framework/renderers.py')
-rw-r--r--rest_framework/renderers.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index 63578b14..73ae6edc 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):