encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-11 04:07:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Escape \u2028 and \u2029 in JSON output.

Browse Source 
Closes #2169.
This commit is contained in:
Tom Christie 2014-12-03 22:33:34 +00:00
parent 71a8cb2282
commit 23fa6e54ce
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rest_framework/renderers.py
View File

@ -102,6 +102,11 @@ class JSONRenderer(BaseRenderer):
# and may (or may not) be unicode. # and may (or may not) be unicode.
# On python 3.x json.dumps() returns unicode strings. # On python 3.x json.dumps() returns unicode strings.
if isinstance(ret, six.text_type): if isinstance(ret, six.text_type):
# We always fully escape \u2028 and \u2029 to ensure we output JSON
# that is a strict javascript subset. If bytes were returned
# by json.dumps() then we don't have these characters in any case.
# See: http://timelessrepo.com/json-isnt-a-javascript-subset
ret = ret.replace('\u2028', '\\u2028').replace('\u2029', '\\u2029')
return bytes(ret.encode('utf-8')) return bytes(ret.encode('utf-8'))
return ret return ret

9
tests/test_renderers.py
View File

@ -384,6 +384,15 @@ class UnicodeJSONRendererTests(TestCase):
content = renderer.render(obj, 'application/json') content = renderer.render(obj, 'application/json')
self.assertEqual(content, '{"countries":["United Kingdom","France","España"]}'.encode('utf-8')) self.assertEqual(content, '{"countries":["United Kingdom","France","España"]}'.encode('utf-8'))
def test_u2028_u2029(self):
# The \u2028 and \u2029 characters should be escaped,
# even when the non-escaping unicode representation is used.
# Regression test for #2169
obj = {'should_escape': '\u2028\u2029'}
renderer = JSONRenderer()
content = renderer.render(obj, 'application/json')
self.assertEqual(content, '{"should_escape":"\\u2028\\u2029"}'.encode('utf-8'))
class AsciiJSONRendererTests(TestCase): class AsciiJSONRendererTests(TestCase):
""" """