Upgrade ujson to 1.35

CHANGELOG.rst

@@ -7,7 +7,9 @@ This document describes changes between each past release.
 2.14.1 (unreleased)
 -------------------
 
-- Nothing changed yet.
+**Protocol**
+
+- Forward slashes (``/``) are not escaped anymore in JSON responses (ref #537)
 
 
 2.14.0 (2016-01-15)

cliquet/initialization.py

@@ -52,7 +52,7 @@ def setup_json_serializer(config):
     requests.models.json = utils.json
 
     # Override json renderer using ujson
-    renderer = JSONRenderer(serializer=lambda v, **kw: utils.json.dumps(v))
+    renderer = JSONRenderer(serializer=utils.json_serializer)
     config.add_renderer('json', renderer)
 
 

cliquet/tests/test_views_hello.py

@@ -14,6 +14,10 @@ def test_returns_info_about_url_and_version(self):
         self.assertEqual(response.json['project_docs'],
                          'https://cliquet.rtfd.org/')
 
+    def test_does_not_escape_forward_slashes(self):
+        response = self.app.get('/')
+        self.assertNotIn('\\/', str(response.body))
+
     def test_do_not_returns_eos_if_empty_in_settings(self):
         response = self.app.get('/')
         self.assertNotIn('eos', response.json)

cliquet/utils.py

@@ -9,12 +9,19 @@
 from base64 import b64decode, b64encode
 from binascii import hexlify
 from six.moves.urllib import parse as urlparse
+
 # ujson is not installable with pypy
-try:
+try:  # pragma: no cover
     import ujson as json  # NOQA
+
+    def json_serializer(v, **kw):
+        return json.dumps(v, escape_forward_slashes=False)
+
 except ImportError:  # pragma: no cover
     import json  # NOQA
 
+    json_serializer = json.dumps
+
 try:
     # Register psycopg2cffi as psycopg2
     from psycopg2cffi import compat

setup.py

@@ -39,7 +39,7 @@
     ]
 else:
     # ujson is not pypy compliant, as it uses the CPython C API
-    REQUIREMENTS.append('ujson')
+    REQUIREMENTS.append('ujson >= 1.35')
     POSTGRESQL_REQUIRES = [
         'SQLAlchemy',
         'psycopg2>2.5',