From 8f76efeb2f29c525086172c8c570e82499e1db83 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Mon, 4 Feb 2013 10:03:29 -0600 Subject: [PATCH] fixed issue 1320 (http://timelessrepo.com/json-isnt-a-javascript-subset), thanks Alan --- VERSION | 2 +- gluon/serializers.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 3e8d8717..09d2eb37 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.1-alpha.2+timestamp.2013.02.04.10.00.20 +Version 2.4.1-alpha.2+timestamp.2013.02.04.10.02.48 diff --git a/gluon/serializers.py b/gluon/serializers.py index 8aece0fd..1d2621d2 100644 --- a/gluon/serializers.py +++ b/gluon/serializers.py @@ -73,8 +73,12 @@ def xml(value, encoding='UTF-8', key='document', quote=True): def json(value, default=custom_json): - return json_parser.dumps(value, default=default) - + # replace JavaScript incompatible spacing + # http://timelessrepo.com/json-isnt-a-javascript-subset + return json_parser.dumps(value, + default=default).replace(ur'\u2028', + '\\u2028').replace(ur'\2029', + '\\u2029') def csv(value): return ''