Switch to ujson 1.35

cliquet/tests/test_views_hello.py

@@ -13,6 +13,10 @@ def test_returns_info_about_url_and_version(self):
         self.assertEqual(response.json['documentation'],
                          'https://cliquet.rtfd.org/')
 
+    def test_does_not_escape_forward_slashes(self):
+        response = self.app.get('/')
+        self.assertNotIn('\\/', 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

@@ -1,4 +1,5 @@
 import ast
+import functools
 import hashlib
 import hmac
 import os
@@ -9,9 +10,9 @@
 from binascii import hexlify
 from six.moves.urllib import parse as urlparse
 
-# ultrajson is not installable with pypy
+# ujson is not installable with pypy
 try:
-    import ultrajson as json  # NOQA
+    import ujson as json  # NOQA
 
     def json_serializer(v, **kw):
         return json.dumps(v, escape_forward_slashes=False)

setup.py

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