aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/renderers.py
diff options
context:
space:
mode:
authorXavier Ordoquy2012-11-22 00:20:49 +0100
committerXavier Ordoquy2012-11-22 00:20:49 +0100
commitb3698acb6c0b9eaa04189599e27014c788a75adc (patch)
tree25de3a90ca99b6de980ce0c4031ffb512d9f9c00 /rest_framework/renderers.py
parentab3c47297481b7a4ff66027618f9c05bf02a2204 (diff)
downloaddjango-rest-framework-b3698acb6c0b9eaa04189599e27014c788a75adc.tar.bz2
First passing test under p3k \o/
Diffstat (limited to 'rest_framework/renderers.py')
-rw-r--r--rest_framework/renderers.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index 27340745..bd0dd663 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -6,6 +6,8 @@ on the response, such as JSON encoded data or HTML output.
REST framework also provides an HTML renderer the renders the browsable API.
"""
+from __future__ import unicode_literals
+
import copy
import string
from django import forms
@@ -60,7 +62,7 @@ class JSONRenderer(BaseRenderer):
if accepted_media_type:
# If the media type looks like 'application/json; indent=4',
# then pretty print the result.
- base_media_type, params = parse_header(accepted_media_type)
+ base_media_type, params = parse_header(accepted_media_type.encode('ascii'))
indent = params.get('indent', indent)
try:
indent = max(min(int(indent), 8), 0)
@@ -100,7 +102,7 @@ class JSONPRenderer(JSONRenderer):
callback = self.get_callback(renderer_context)
json = super(JSONPRenderer, self).render(data, accepted_media_type,
renderer_context)
- return u"%s(%s);" % (callback, json)
+ return "%s(%s);" % (callback, json)
class XMLRenderer(BaseRenderer):