diff options
| author | Tom Christie | 2014-12-05 12:46:36 +0000 |
|---|---|---|
| committer | Tom Christie | 2014-12-05 12:46:36 +0000 |
| commit | 99a43748eb5664ae152939deee3d0145da04e07b (patch) | |
| tree | 0997ab92f1344c874d35f08de1162677aee29fe7 /rest_framework | |
| parent | 1b8c06aefe33f178610d2c4195a72637757698e8 (diff) | |
| parent | de4ef6e3945e1281e0145d7ca19b6213f2aebfc6 (diff) | |
| download | django-rest-framework-99a43748eb5664ae152939deee3d0145da04e07b.tar.bz2 | |
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
Diffstat (limited to 'rest_framework')
| -rw-r--r-- | rest_framework/renderers.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 31d3ef5f..07f1c628 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -102,6 +102,11 @@ class JSONRenderer(BaseRenderer): # and may (or may not) be unicode. # On python 3.x json.dumps() returns unicode strings. 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 ret |