Merge lp:~thisfred/u1db/deprecate-simplejson into lp:u1db

[Eric Casteleijn]

Removed simplejson as a hard dependency. It will still be used if present.

Removed simplejson as a hard dependency. It will still be used if present.

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'setup.py'
--- setup.py	2012-07-03 18:15:07 +0000
+++ setup.py	2012-08-14 14:33:39 +0000
@@ -15,7 +15,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with u1db.  If not, see <http://www.gnu.org/licenses/>.
 
-import os
 import sys
 
 
@@ -23,7 +22,7 @@
     try:
         from setuptools import setup, Extension, find_packages
     except ImportError:
-        from distutils.core import setup, Extension, find_packages
+        from distutils.core import setup, Extension, find_packages  # noqa
     import u1db
     ext = []
     kwargs = {
@@ -40,7 +39,7 @@
         "package_data": {'': ["*.sql"]},
         "scripts": ['u1db-client', 'u1db-serve'],
         "ext_modules": ext,
-        "install_requires": ["dirspec", "paste", "simplejson", "routes"],
+        "install_requires": ["dirspec", "paste", "routes"],
         # informational
         "tests_require": ["testtools", "testscenarios", "Cython",
                           "pyOpenSSL"],
@@ -66,7 +65,7 @@
     }
     try:
         from Cython.Distutils import build_ext
-    except ImportError, e:
+    except ImportError:
         print "Unable to import Cython, to test the C implementation"
     else:
         kwargs["cmdclass"] = {"build_ext": build_ext}

=== modified file 'u1db/__init__.py'
--- u1db/__init__.py	2012-08-02 13:26:05 +0000
+++ u1db/__init__.py	2012-08-14 14:33:39 +0000
@@ -16,7 +16,11 @@
 
 """U1DB"""
 
-import simplejson
+try:
+    import simplejson as json
+except ImportError:
+    import json  # noqa
+
 from u1db.errors import InvalidJSON, InvalidContent
 
 __version_info__ = (0, 1, 0)
@@ -385,31 +389,31 @@
 
     :ivar doc_id: Unique identifier for this document.
     :ivar rev:
-    :ivar json: The JSON string for this document.
+    :ivar json_string: The JSON string for this document.
     :ivar has_conflicts: Boolean indicating if this document has conflicts
     """
 
-    def __init__(self, doc_id, rev, json, has_conflicts=False):
+    def __init__(self, doc_id, rev, json_string, has_conflicts=False):
         self.doc_id = doc_id
         self.rev = rev
-        if json is not None:
+        if json_string is not None:
             try:
-                value = simplejson.loads(json)
-            except simplejson.JSONDecodeError:
+                value = json.loads(json_string)
+            except json.JSONDecodeError:
                 raise InvalidJSON
             if not isinstance(value, dict):
                 raise InvalidJSON
-        self._json = json
+        self._json = json_string
         self.has_conflicts = has_conflicts
 
     def same_content_as(self, other):
         """Compare the content of two documents."""
         if self._json:
-            c1 = simplejson.loads(self._json)
+            c1 = json.loads(self._json)
         else:
             c1 = None
         if other._json:
-            c2 = simplejson.loads(other._json)
+            c2 = json.loads(other._json)
         else:
             c2 = None
         return c1 == c2
@@ -463,16 +467,16 @@
             size += len(self.doc_id)
         return size
 
-    def set_json(self, json):
+    def set_json(self, json_string):
         """Set the json serialization of this document."""
-        if json is not None:
+        if json_string is not None:
             try:
-                self._content = simplejson.loads(json)
-            except simplejson.JSONDecodeError:
-                raise InvalidJSON
-            if not isinstance(self._content, dict):
-                raise InvalidJSON
-        self._json = json
+                value = json.loads(json_string)
+            except json.JSONDecodeError:
+                raise InvalidJSON
+            if not isinstance(value, dict):
+                raise InvalidJSON
+        self._json = json_string
 
     def make_tombstone(self):
         """Make this document into a tombstone."""
@@ -508,29 +512,26 @@
     def same_content_as(self, other):
         """Compare the content of two documents."""
         if self._json:
-            c1 = simplejson.loads(self._json)
+            c1 = json.loads(self._json)
         else:
             c1 = self._content
         if other._json:
-            c2 = simplejson.loads(other._json)
+            c2 = json.loads(other._json)
         else:
             c2 = other._content
         return c1 == c2
 
     def get_json(self):
         """Get the json serialization of this document."""
-        json = super(Document, self).get_json()
-        if json is not None:
-            return json
+        json_string = super(Document, self).get_json()
+        if json_string is not None:
+            return json_string
         if self._content is not None:
-            return simplejson.dumps(self._content)
+            return json.dumps(self._content)
         return None
 
     def set_json(self, json):
         """Set the json serialization of this document."""
-        # TODO: We convert the json in the superclass to check its validity so
-        # we might as well set _content here directly since the price is
-        # already being paid.
         self._content = None
         super(Document, self).set_json(json)
 
@@ -548,7 +549,7 @@
     def _get_content(self):
         """Get the dictionary representing this document."""
         if self._json is not None:
-            self._content = simplejson.loads(self._json)
+            self._content = json.loads(self._json)
             self._json = None
         if self._content is not None:
             return self._content
@@ -557,7 +558,7 @@
     def _set_content(self, content):
         """Set the dictionary representing this document."""
         try:
-            tmp = simplejson.dumps(content)
+            tmp = json.dumps(content)
         except TypeError:
             raise InvalidContent(
                 "Can not be converted to JSON: %r" % (content,))

=== modified file 'u1db/backends/__init__.py'
--- u1db/backends/__init__.py	2012-08-09 16:03:46 +0000
+++ u1db/backends/__init__.py	2012-08-14 14:33:39 +0000
@@ -17,7 +17,10 @@
 """Abstract classes and common implementations for the backends."""
 
 import re
-import simplejson
+try:
+    import simplejson as json
+except ImportError:
+    import json  # noqa
 import uuid
 
 import u1db
@@ -85,10 +88,10 @@
         raise NotImplementedError(self._has_conflicts)
 
     def create_doc(self, content, doc_id=None):
-        json = simplejson.dumps(content)
+        json_string = json.dumps(content)
         if doc_id is None:
             doc_id = self._allocate_doc_id()
-        doc = self._factory(doc_id, None, json)
+        doc = self._factory(doc_id, None, json_string)
         self.put_doc(doc)
         return doc
 

=== modified file 'u1db/backends/inmemory.py'
--- u1db/backends/inmemory.py	2012-08-09 22:22:58 +0000
+++ u1db/backends/inmemory.py	2012-08-14 14:33:39 +0000
@@ -16,7 +16,10 @@
 
 """The in-memory Database class for U1DB."""
 
-import simplejson
+try:
+    import simplejson as json
+except ImportError:
+    import json  # noqa
 
 from u1db import (
     Document,
@@ -324,7 +327,7 @@
 
     def evaluate_json(self, doc):
         """Determine the 'key' after applying this index to the doc."""
-        raw = simplejson.loads(doc)
+        raw = json.loads(doc)
         return self.evaluate(raw)
 
     def evaluate(self, obj):

=== modified file 'u1db/backends/sqlite_backend.py'
--- u1db/backends/sqlite_backend.py	2012-08-09 20:46:13 +0000
+++ u1db/backends/sqlite_backend.py	2012-08-14 14:33:39 +0000
@@ -18,7 +18,10 @@
 
 import errno
 import os
-import simplejson
+try:
+    import simplejson as json
+except ImportError:
+    import json  # noqa
 from sqlite3 import dbapi2
 import sys
 import time
@@ -853,7 +856,7 @@
     def _put_and_update_indexes(self, old_doc, doc):
         c = self._db_handle.cursor()
         if doc and not doc.is_tombstone():
-            raw_doc = simplejson.loads(doc.get_json())
+            raw_doc = json.loads(doc.get_json())
         else:
             raw_doc = {}
         if old_doc is not None:
@@ -917,7 +920,7 @@
         for doc_id, doc in self._iter_all_docs():
             if doc is None:
                 continue
-            raw_doc = simplejson.loads(doc)
+            raw_doc = json.loads(doc)
             self._update_indexes(doc_id, raw_doc, getters, c)
 
 SQLiteDatabase.register_implementation(SQLitePartialExpandDatabase)

=== modified file 'u1db/commandline/client.py'
--- u1db/commandline/client.py	2012-07-19 19:50:58 +0000
+++ u1db/commandline/client.py	2012-08-14 14:33:39 +0000
@@ -18,7 +18,10 @@
 
 import argparse
 import os
-import simplejson
+try:
+    import simplejson as json
+except ImportError:
+    import json  # noqa
 import sys
 
 from u1db import (
@@ -172,9 +175,8 @@
         for i, doc in enumerate(conflicts):
             if i:
                 self.stdout.write(",")
-            self.stdout.write(simplejson.dumps(dict(rev=doc.rev,
-                                                    content=doc.content),
-                                               indent=4))
+            self.stdout.write(
+                json.dumps(dict(rev=doc.rev, content=doc.content), indent=4))
         self.stdout.write("]\n")
 
 client_commands.register(CmdGetDocConflicts)
@@ -480,10 +482,10 @@
             for i, doc in enumerate(docs):
                 if i:
                     self.stdout.write(",")
-                self.stdout.write(simplejson.dumps(dict(
-                            id=doc.doc_id,
-                            rev=doc.rev,
-                            content=doc.content), indent=4))
+                self.stdout.write(
+                    json.dumps(
+                        dict(id=doc.doc_id, rev=doc.rev, content=doc.content),
+                        indent=4))
             self.stdout.write("]\n")
             return
         return 1

=== modified file 'u1db/remote/http_app.py'
--- u1db/remote/http_app.py	2012-07-12 17:21:15 +0000
+++ u1db/remote/http_app.py	2012-08-14 14:33:39 +0000
@@ -19,7 +19,10 @@
 import functools
 import httplib
 import inspect
-import simplejson
+try:
+    import simplejson as json
+except ImportError:
+    import json  # noqa
 import sys
 import urlparse
 
@@ -121,7 +124,7 @@
 
        JSON deserialize content to arguments:
            w = http_method(content_as_args=True,...)(f)
-           w(self, args, content) => args.update(simplejson.loads(content));
+           w(self, args, content) => args.update(json.loads(content));
                                      f(self, **args)
 
        Support conversions (e.g int):
@@ -154,7 +157,7 @@
             if content is not None:
                 if content_as_args:
                     try:
-                        args.update(simplejson.loads(content))
+                        args.update(json.loads(content))
                     except ValueError:
                         raise BadRequest()
                 else:
@@ -309,7 +312,7 @@
             return
         headers = {
             'x-u1db-rev': doc.rev,
-            'x-u1db-has-conflicts': simplejson.dumps(doc.has_conflicts)
+            'x-u1db-has-conflicts': json.dumps(doc.has_conflicts)
             }
         if doc.is_tombstone():
             self.responder.send_response_json(
@@ -416,7 +419,7 @@
         # xxx version in headers
         if obj_dic is not None:
             self._no_initial_obj = False
-            self._write(simplejson.dumps(obj_dic) + "\r\n")
+            self._write(json.dumps(obj_dic) + "\r\n")
 
     def finish_response(self):
         """finish sending response."""
@@ -424,7 +427,7 @@
 
     def send_response_json(self, status=200, headers={}, **kwargs):
         """send and finish response with json object body from keyword args."""
-        content = simplejson.dumps(kwargs) + "\r\n"
+        content = json.dumps(kwargs) + "\r\n"
         self.send_response_content(content, headers=headers, status=status)
 
     def send_response_content(self, content, status=200, headers={}):
@@ -451,7 +454,7 @@
             self._write('\r\n')
         else:
             self._write(',\r\n')
-        self._write(simplejson.dumps(entry))
+        self._write(json.dumps(entry))
 
     def end_stream(self):
         "end stream (array)."

=== modified file 'u1db/remote/http_client.py'
--- u1db/remote/http_client.py	2012-06-25 16:53:15 +0000
+++ u1db/remote/http_client.py	2012-08-14 14:33:39 +0000
@@ -18,7 +18,10 @@
 
 import httplib
 from oauth import oauth
-import simplejson
+try:
+    import simplejson as json
+except ImportError:
+    import json  # noqa
 import socket
 import ssl
 import sys
@@ -33,7 +36,7 @@
     http_errors,
     )
 
-from u1db.remote.ssl_match_hostname import (
+from u1db.remote.ssl_match_hostname import (  # noqa
     CertificateError,
     match_hostname,
     )
@@ -137,7 +140,7 @@
             return body, headers
         elif resp.status in http_errors.ERROR_STATUSES:
             try:
-                respdic = simplejson.loads(body)
+                respdic = json.loads(body)
             except ValueError:
                 pass
             else:
@@ -184,7 +187,7 @@
                 encoded_params[key] = _encode_query_parameter(value)
             url_query += ('?' + urllib.urlencode(encoded_params))
         if body is not None and not isinstance(body, basestring):
-            body = simplejson.dumps(body)
+            body = json.dumps(body)
             content_type = 'application/json'
         headers = {}
         if content_type:
@@ -203,4 +206,4 @@
                                                             content_type=None):
         res, headers = self._request(method, url_parts, params, body,
                                      content_type)
-        return simplejson.loads(res), headers
+        return json.loads(res), headers

=== modified file 'u1db/remote/http_database.py'
--- u1db/remote/http_database.py	2012-07-26 19:14:26 +0000
+++ u1db/remote/http_database.py	2012-08-14 14:33:39 +0000
@@ -16,7 +16,10 @@
 
 """HTTPDatabase to access a remote db over the HTTP API."""
 
-import simplejson
+try:
+    import simplejson as json
+except ImportError:
+    import json  # noqa
 import uuid
 
 from u1db import (
@@ -97,7 +100,7 @@
             else:
                 raise
         doc_rev = headers['x-u1db-rev']
-        has_conflicts = simplejson.loads(headers['x-u1db-has-conflicts'])
+        has_conflicts = json.loads(headers['x-u1db-has-conflicts'])
         doc = self._factory(doc_id, doc_rev, res)
         doc.has_conflicts = has_conflicts
         return doc
@@ -111,7 +114,7 @@
             'GET', ['docs'], {
                 "doc_ids": doc_ids, "include_deleted": include_deleted,
                 "check_for_conflicts": check_for_conflicts})
-        for doc_dict in simplejson.loads(res):
+        for doc_dict in json.loads(res):
             doc = self._factory(
                 doc_dict['doc_id'], doc_dict['doc_rev'], doc_dict['content'])
             doc.has_conflicts = doc_dict['has_conflicts']

=== modified file 'u1db/remote/http_target.py'
--- u1db/remote/http_target.py	2012-07-06 20:48:40 +0000
+++ u1db/remote/http_target.py	2012-08-14 14:33:39 +0000
@@ -16,7 +16,10 @@
 
 """SyncTarget API implementation to a remote HTTP server."""
 
-import simplejson
+try:
+    import simplejson as json
+except ImportError:
+    import json  # noqa
 
 from u1db import (
     Document,
@@ -59,17 +62,17 @@
         data = parts[1:-1]
         if data:
             line, comma = utils.check_and_strip_comma(data[0])
-            res = simplejson.loads(line)
+            res = json.loads(line)
             for entry in data[1:]:
                 if not comma:  # missing in between comma
                     raise BrokenSyncStream
                 line, comma = utils.check_and_strip_comma(entry)
-                entry = simplejson.loads(line)
+                entry = json.loads(line)
                 doc = Document(entry['id'], entry['rev'], entry['content'])
                 return_doc_cb(doc, entry['gen'], entry['trans_id'])
         if parts[-1] != ']':
             try:
-                partdic = simplejson.loads(parts[-1])
+                partdic = json.loads(parts[-1])
             except ValueError:
                 pass
             else:
@@ -93,7 +96,7 @@
         size = 1
 
         def prepare(**dic):
-            entry = comma + '\r\n' + simplejson.dumps(dic)
+            entry = comma + '\r\n' + json.dumps(dic)
             entries.append(entry)
             return len(entry)
 

=== modified file 'u1db/remote/oauth_middleware.py'
--- u1db/remote/oauth_middleware.py	2012-04-05 13:58:46 +0000
+++ u1db/remote/oauth_middleware.py	2012-08-14 14:33:39 +0000
@@ -16,10 +16,12 @@
 """U1DB OAuth authorisation WSGI middleware."""
 import httplib
 from oauth import oauth
-import simplejson
+try:
+    import simplejson as json
+except ImportError:
+    import json  # noqa
 from urllib import quote
 from wsgiref.util import shift_path_info
-import sys
 
 
 sign_meth_HMAC_SHA1 = oauth.OAuthSignatureMethod_HMAC_SHA1()
@@ -47,7 +49,7 @@
         err = {"error": description}
         if message:
             err['message'] = message
-        return [simplejson.dumps(err)]
+        return [json.dumps(err)]
 
     def __call__(self, environ, start_response):
         if not environ['PATH_INFO'].startswith('/~/'):

=== modified file 'u1db/tests/commandline/test_client.py'
--- u1db/tests/commandline/test_client.py	2012-07-19 19:50:58 +0000
+++ u1db/tests/commandline/test_client.py	2012-08-14 14:33:39 +0000
@@ -17,7 +17,10 @@
 import cStringIO
 import os
 import sys
-import simplejson
+try:
+    import simplejson as json
+except ImportError:
+    import json  # noqa
 import subprocess
 
 from u1db import (
@@ -253,7 +256,8 @@
 
     def setUp(self):
         super(TestCmdGet, self).setUp()
-        self.doc = self.db.create_doc_from_json(tests.simple_doc, doc_id='my-test-doc')
+        self.doc = self.db.create_doc_from_json(
+            tests.simple_doc, doc_id='my-test-doc')
 
     def test_get_simple(self):
         cmd = self.make_command(client.CmdGet)
@@ -292,7 +296,8 @@
 
     def setUp(self):
         super(TestCmdGetDocConflicts, self).setUp()
-        self.doc1 = self.db.create_doc_from_json(tests.simple_doc, doc_id='my-doc')
+        self.doc1 = self.db.create_doc_from_json(
+            tests.simple_doc, doc_id='my-doc')
         self.doc2 = self.make_document('my-doc', 'other:1', '{}', False)
         self.db._put_doc_if_newer(
             self.doc2, save_conflict=True, replica_uid='r', replica_gen=1,
@@ -302,17 +307,16 @@
         self.db.create_doc_from_json(tests.simple_doc, doc_id='a-doc')
         cmd = self.make_command(client.CmdGetDocConflicts)
         cmd.run(self.db_path, 'a-doc')
-        self.assertEqual([],
-                         simplejson.loads(cmd.stdout.getvalue()))
+        self.assertEqual([], json.loads(cmd.stdout.getvalue()))
         self.assertEqual('', cmd.stderr.getvalue())
 
     def test_get_doc_conflicts_simple(self):
         cmd = self.make_command(client.CmdGetDocConflicts)
         cmd.run(self.db_path, 'my-doc')
-        self.assertEqual([dict(rev=self.doc2.rev, content=self.doc2.content),
-                          dict(rev=self.doc1.rev, content=self.doc1.content),
-                          ],
-                         simplejson.loads(cmd.stdout.getvalue()))
+        self.assertEqual(
+            [dict(rev=self.doc2.rev, content=self.doc2.content),
+             dict(rev=self.doc1.rev, content=self.doc1.content)],
+            json.loads(cmd.stdout.getvalue()))
         self.assertEqual('', cmd.stderr.getvalue())
 
     def test_get_doc_conflicts_no_db(self):
@@ -354,7 +358,8 @@
 
     def setUp(self):
         super(TestCmdPut, self).setUp()
-        self.doc = self.db.create_doc_from_json(tests.simple_doc, doc_id='my-test-doc')
+        self.doc = self.db.create_doc_from_json(
+            tests.simple_doc, doc_id='my-test-doc')
 
     def test_put_simple(self):
         cmd = self.make_command(client.CmdPut)
@@ -416,7 +421,8 @@
 
     def setUp(self):
         super(TestCmdResolve, self).setUp()
-        self.doc1 = self.db.create_doc_from_json(tests.simple_doc, doc_id='my-doc')
+        self.doc1 = self.db.create_doc_from_json(
+            tests.simple_doc, doc_id='my-doc')
         self.doc2 = self.make_document('my-doc', 'other:1', '{}', False)
         self.db._put_doc_if_newer(
             self.doc2, save_conflict=True, replica_uid='r', replica_gen=1,
@@ -477,8 +483,10 @@
         self.db2 = u1db_open(self.db2_path, create=True)
         self.addCleanup(self.db2.close)
         self.db2._set_replica_uid('test2')
-        self.doc = self.db.create_doc_from_json(tests.simple_doc, doc_id='test-id')
-        self.doc2 = self.db2.create_doc_from_json(tests.nested_doc, doc_id='my-test-id')
+        self.doc = self.db.create_doc_from_json(
+            tests.simple_doc, doc_id='test-id')
+        self.doc2 = self.db2.create_doc_from_json(
+            tests.nested_doc, doc_id='my-test-id')
 
     def test_sync(self):
         cmd = self.make_command(client.CmdSync)
@@ -674,7 +682,7 @@
         cmd = self.make_command(client.CmdGetFromIndex)
         retval = cmd.run(self.db_path, "index", ["value"])
         self.assertEqual(retval, None)
-        self.assertEqual(sorted(simplejson.loads(cmd.stdout.getvalue())),
+        self.assertEqual(sorted(json.loads(cmd.stdout.getvalue())),
                          sorted([dict(id=doc1.doc_id,
                                       rev=doc1.rev,
                                       content=doc1.content),

=== modified file 'u1db/tests/test_backends.py'
--- u1db/tests/test_backends.py	2012-08-09 22:22:58 +0000
+++ u1db/tests/test_backends.py	2012-08-14 14:33:39 +0000
@@ -16,7 +16,10 @@
 
 """The backend class for U1DB. This deals with hiding storage details."""
 
-import simplejson
+try:
+    import simplejson as json
+except ImportError:
+    import json  # noqa
 from u1db import (
     DocumentBase,
     errors,
@@ -144,12 +147,12 @@
         self.assertEqual(doc.rev, new_rev)
 
     def test_put_non_ascii_key(self):
-        content = simplejson.dumps({u'key\xe5': u'val'})
+        content = json.dumps({u'key\xe5': u'val'})
         doc = self.db.create_doc_from_json(content, doc_id='my_doc')
         self.assertGetDoc(self.db, 'my_doc', doc.rev, content, False)
 
     def test_put_non_ascii_value(self):
-        content = simplejson.dumps({'key': u'\xe5'})
+        content = json.dumps({'key': u'\xe5'})
         doc = self.db.create_doc_from_json(content, doc_id='my_doc')
         self.assertGetDoc(self.db, 'my_doc', doc.rev, content, False)
 
@@ -1022,8 +1025,7 @@
                          self.db.list_indexes())
 
     def test_create_index_on_non_ascii_field_name(self):
-        doc = self.db.create_doc_from_json(
-            simplejson.dumps({u'\xe5': 'value'}))
+        doc = self.db.create_doc_from_json(json.dumps({u'\xe5': 'value'}))
         self.db.create_index('test-idx', u'\xe5')
         self.assertEqual([doc], self.db.get_from_index('test-idx', 'value'))
 
@@ -1038,14 +1040,12 @@
         self.assertEqual([doc], self.db.get_from_index('test-idx', 'value'))
 
     def test_wildcard_matches_unicode_value(self):
-        doc = self.db.create_doc_from_json(simplejson.dumps(
-            {"key": u"valu\xe5"}))
+        doc = self.db.create_doc_from_json(json.dumps({"key": u"valu\xe5"}))
         self.db.create_index('test-idx', 'key')
         self.assertEqual([doc], self.db.get_from_index('test-idx', '*'))
 
     def test_retrieve_unicode_value_from_index(self):
-        doc = self.db.create_doc_from_json(simplejson.dumps(
-            {"key": u"valu\xe5"}))
+        doc = self.db.create_doc_from_json(json.dumps({"key": u"valu\xe5"}))
         self.db.create_index('test-idx', 'key')
         self.assertEqual(
             [doc], self.db.get_from_index('test-idx', u"valu\xe5"))
@@ -1812,7 +1812,7 @@
 
     def setUp(self):
         super(PythonBackendTests, self).setUp()
-        self.simple_doc = simplejson.loads(simple_doc)
+        self.simple_doc = json.loads(simple_doc)
 
     def test_create_doc_with_factory(self):
         self.db.set_document_factory(TestAlternativeDocument)

=== modified file 'u1db/tests/test_c_backend.py'
--- u1db/tests/test_c_backend.py	2012-07-19 19:50:58 +0000
+++ u1db/tests/test_c_backend.py	2012-08-14 14:33:39 +0000
@@ -14,7 +14,10 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with u1db.  If not, see <http://www.gnu.org/licenses/>.
 
-import simplejson
+try:
+    import simplejson as json
+except ImportError:
+    import json  # noqa
 from u1db import (
     Document,
     errors,
@@ -114,7 +117,7 @@
 
     def test_create_index_list_on_non_ascii_field_name(self):
         self.db = c_backend_wrapper.CDatabase(':memory:')
-        doc = self.db.create_doc_from_json(simplejson.dumps({u'\xe5': 'value'}))
+        doc = self.db.create_doc_from_json(json.dumps({u'\xe5': 'value'}))
         self.db.create_index_list('test-idx', [u'\xe5'])
         self.assertEqual([doc], self.db.get_from_index('test-idx', 'value'))
 
@@ -132,7 +135,7 @@
 
     def test_wildcard_matches_unicode_value(self):
         self.db = c_backend_wrapper.CDatabase(':memory:')
-        doc = self.db.create_doc_from_json(simplejson.dumps({"key": u"valu\xe5"}))
+        doc = self.db.create_doc_from_json(json.dumps({"key": u"valu\xe5"}))
         self.db.create_index_list('test-idx', ['key'])
         self.assertEqual([doc], self.db.get_from_index('test-idx', '*'))
 
@@ -186,10 +189,14 @@
 
     def test_get_from_index_list_multi_ordered(self):
         self.db = c_backend_wrapper.CDatabase(':memory:')
-        doc1 = self.db.create_doc_from_json('{"key": "value3", "key2": "value4"}')
-        doc2 = self.db.create_doc_from_json('{"key": "value2", "key2": "value3"}')
-        doc3 = self.db.create_doc_from_json('{"key": "value2", "key2": "value2"}')
-        doc4 = self.db.create_doc_from_json('{"key": "value1", "key2": "value1"}')
+        doc1 = self.db.create_doc_from_json(
+            '{"key": "value3", "key2": "value4"}')
+        doc2 = self.db.create_doc_from_json(
+            '{"key": "value2", "key2": "value3"}')
+        doc3 = self.db.create_doc_from_json(
+            '{"key": "value2", "key2": "value2"}')
+        doc4 = self.db.create_doc_from_json(
+            '{"key": "value1", "key2": "value1"}')
         self.db.create_index('test-idx', 'key', 'key2')
         self.assertEqual(
             [doc4, doc3, doc2, doc1],

=== modified file 'u1db/tests/test_http_app.py'
--- u1db/tests/test_http_app.py	2012-07-19 19:50:58 +0000
+++ u1db/tests/test_http_app.py	2012-08-14 14:33:39 +0000
@@ -18,7 +18,10 @@
 
 import paste.fixture
 import sys
-import simplejson
+try:
+    import simplejson as json
+except ImportError:
+    import json  # noqa
 import StringIO
 
 from u1db import (
@@ -540,21 +543,20 @@
         resp = self.app.get('/')
         self.assertEqual(200, resp.status)
         self.assertEqual('application/json', resp.header('content-type'))
-        self.assertEqual({"version": _u1db_version},
-                         simplejson.loads(resp.body))
+        self.assertEqual({"version": _u1db_version}, json.loads(resp.body))
 
     def test_create_database(self):
         resp = self.app.put('/db1', params='{}',
                             headers={'content-type': 'application/json'})
         self.assertEqual(200, resp.status)
         self.assertEqual('application/json', resp.header('content-type'))
-        self.assertEqual({'ok': True}, simplejson.loads(resp.body))
+        self.assertEqual({'ok': True}, json.loads(resp.body))
 
         resp = self.app.put('/db1', params='{}',
                             headers={'content-type': 'application/json'})
         self.assertEqual(200, resp.status)
         self.assertEqual('application/json', resp.header('content-type'))
-        self.assertEqual({'ok': True}, simplejson.loads(resp.body))
+        self.assertEqual({'ok': True}, json.loads(resp.body))
 
     def test_delete_database(self):
         resp = self.app.delete('/db0')
@@ -566,7 +568,7 @@
         resp = self.app.get('/db0')
         self.assertEqual(200, resp.status)
         self.assertEqual('application/json', resp.header('content-type'))
-        self.assertEqual({}, simplejson.loads(resp.body))
+        self.assertEqual({}, json.loads(resp.body))
 
     def test_valid_database_names(self):
         resp = self.app.get('/a-database', expect_errors=True)
@@ -601,7 +603,7 @@
         self.assertEqual(201, resp.status)  # created
         self.assertEqual('{"x": 1}', doc.get_json())
         self.assertEqual('application/json', resp.header('content-type'))
-        self.assertEqual({'rev': doc.rev}, simplejson.loads(resp.body))
+        self.assertEqual({'rev': doc.rev}, json.loads(resp.body))
 
     def test_put_doc(self):
         doc = self.db0.create_doc_from_json('{"x": 1}', doc_id='doc1')
@@ -612,7 +614,7 @@
         self.assertEqual(200, resp.status)
         self.assertEqual('{"x": 2}', doc.get_json())
         self.assertEqual('application/json', resp.header('content-type'))
-        self.assertEqual({'rev': doc.rev}, simplejson.loads(resp.body))
+        self.assertEqual({'rev': doc.rev}, json.loads(resp.body))
 
     def test_put_doc_too_large(self):
         self.http_app.max_request_size = 15000
@@ -630,7 +632,7 @@
         self.assertEqual(None, doc.content)
         self.assertEqual(200, resp.status)
         self.assertEqual('application/json', resp.header('content-type'))
-        self.assertEqual({'rev': doc.rev}, simplejson.loads(resp.body))
+        self.assertEqual({'rev': doc.rev}, json.loads(resp.body))
 
     def test_get_doc(self):
         doc = self.db0.create_doc_from_json('{"x": 1}', doc_id='doc1')
@@ -645,8 +647,8 @@
         resp = self.app.get('/db0/doc/not-there', expect_errors=True)
         self.assertEqual(404, resp.status)
         self.assertEqual('application/json', resp.header('content-type'))
-        self.assertEqual({"error": "document does not exist"},
-                         simplejson.loads(resp.body))
+        self.assertEqual(
+            {"error": "document does not exist"}, json.loads(resp.body))
         self.assertEqual('', resp.header('x-u1db-rev'))
         self.assertEqual('false', resp.header('x-u1db-has-conflicts'))
 
@@ -658,7 +660,7 @@
         self.assertEqual('application/json', resp.header('content-type'))
         self.assertEqual(
             {"error": errors.DocumentDoesNotExist.wire_description},
-            simplejson.loads(resp.body))
+            json.loads(resp.body))
 
     def test_get_doc_deleted_explicit_exclude(self):
         doc = self.db0.create_doc_from_json('{"x": 1}', doc_id='doc1')
@@ -669,7 +671,7 @@
         self.assertEqual('application/json', resp.header('content-type'))
         self.assertEqual(
             {"error": errors.DocumentDoesNotExist.wire_description},
-            simplejson.loads(resp.body))
+            json.loads(resp.body))
 
     def test_get_deleted_doc(self):
         doc = self.db0.create_doc_from_json('{"x": 1}', doc_id='doc1')
@@ -679,7 +681,7 @@
         self.assertEqual(404, resp.status)
         self.assertEqual('application/json', resp.header('content-type'))
         self.assertEqual(
-            {"error": errors.DOCUMENT_DELETED}, simplejson.loads(resp.body))
+            {"error": errors.DOCUMENT_DELETED}, json.loads(resp.body))
         self.assertEqual(doc.rev, resp.header('x-u1db-rev'))
         self.assertEqual('false', resp.header('x-u1db-has-conflicts'))
 
@@ -687,8 +689,8 @@
         resp = self.app.get('/not-there/doc/doc1', expect_errors=True)
         self.assertEqual(404, resp.status)
         self.assertEqual('application/json', resp.header('content-type'))
-        self.assertEqual({"error": "database does not exist"},
-                         simplejson.loads(resp.body))
+        self.assertEqual(
+            {"error": "database does not exist"}, json.loads(resp.body))
 
     def test_get_docs(self):
         doc1 = self.db0.create_doc_from_json('{"x": 1}', doc_id='doc1')
@@ -703,7 +705,7 @@
              "has_conflicts": False},
             {"content": '{"x": 1}', "doc_rev": "db0:1", "doc_id": "doc2",
              "has_conflicts": False}]
-        self.assertEqual(expected, simplejson.loads(resp.body))
+        self.assertEqual(expected, json.loads(resp.body))
 
     def test_get_docs_percent(self):
         doc1 = self.db0.create_doc_from_json('{"x": 1}', doc_id='doc%1')
@@ -718,7 +720,7 @@
              "has_conflicts": False},
             {"content": '{"x": 1}', "doc_rev": "db0:1", "doc_id": "doc2",
              "has_conflicts": False}]
-        self.assertEqual(expected, simplejson.loads(resp.body))
+        self.assertEqual(expected, json.loads(resp.body))
 
     def test_get_docs_deleted(self):
         doc1 = self.db0.create_doc_from_json('{"x": 1}', doc_id='doc1')
@@ -732,7 +734,7 @@
         expected = [
             {"content": '{"x": 1}', "doc_rev": "db0:1", "doc_id": "doc1",
              "has_conflicts": False}]
-        self.assertEqual(expected, simplejson.loads(resp.body))
+        self.assertEqual(expected, json.loads(resp.body))
 
     def test_get_docs_include_deleted(self):
         doc1 = self.db0.create_doc_from_json('{"x": 1}', doc_id='doc1')
@@ -748,7 +750,7 @@
              "has_conflicts": False},
             {"content": None, "doc_rev": "db0:2", "doc_id": "doc2",
              "has_conflicts": False}]
-        self.assertEqual(expected, simplejson.loads(resp.body))
+        self.assertEqual(expected, json.loads(resp.body))
 
     def test_get_sync_info(self):
         self.db0._set_replica_gen_and_trans_id('other-id', 1, 'T-transid')
@@ -761,7 +763,7 @@
                               source_replica_uid='other-id',
                               source_replica_generation=1,
                               source_transaction_id='T-transid'),
-                              simplejson.loads(resp.body))
+                              json.loads(resp.body))
 
     def test_record_sync_info(self):
         resp = self.app.put('/db0/sync-from/other-id',
@@ -769,7 +771,7 @@
             headers={'content-type': 'application/json'})
         self.assertEqual(200, resp.status)
         self.assertEqual('application/json', resp.header('content-type'))
-        self.assertEqual({'ok': True}, simplejson.loads(resp.body))
+        self.assertEqual({'ok': True}, json.loads(resp.body))
         self.assertEqual(
             (2, 'T-transid'),
             self.db0._get_replica_gen_and_trans_id('other-id'))
@@ -800,9 +802,9 @@
 
         args = dict(last_known_generation=0)
         body = ("[\r\n" +
-                "%s,\r\n" % simplejson.dumps(args) +
-                "%s,\r\n" % simplejson.dumps(entries[10]) +
-                "%s\r\n" % simplejson.dumps(entries[11]) +
+                "%s,\r\n" % json.dumps(args) +
+                "%s,\r\n" % json.dumps(entries[10]) +
+                "%s\r\n" % json.dumps(entries[11]) +
                 "]\r\n")
         resp = self.app.post('/db0/sync-from/replica',
                             params=body,
@@ -816,7 +818,7 @@
         last_trans_id = self.db0._get_transaction_log()[-1][1]
         self.assertEqual({'new_generation': 2,
                           'new_transaction_id': last_trans_id},
-                         simplejson.loads(bits[1]))
+                         json.loads(bits[1]))
         self.assertEqual(']', bits[2])
         self.assertEqual('', bits[3])
         self.assertEqual([('replica', 10), ('replica', 11)], gens)
@@ -830,8 +832,8 @@
             }
         args = dict(last_known_generation=0)
         body = ("[\r\n" +
-                "%s,\r\n" % simplejson.dumps(args) +
-                "%s\r\n" % simplejson.dumps(entries[10]) +
+                "%s,\r\n" % json.dumps(args) +
+                "%s\r\n" % json.dumps(entries[10]) +
                 "]\r\n")
         resp = self.app.post('/db0/sync-from/replica',
                             params=body,
@@ -844,7 +846,7 @@
         doc = self.db0.create_doc_from_json('{"value": "there"}')
         doc2 = self.db0.create_doc_from_json('{"value": "there2"}')
         args = dict(last_known_generation=0)
-        body = "[\r\n%s\r\n]" % simplejson.dumps(args)
+        body = "[\r\n%s\r\n]" % json.dumps(args)
         resp = self.app.post('/db0/sync-from/replica',
                             params=body,
                             headers={'content-type':
@@ -858,14 +860,14 @@
         last_trans_id = self.db0._get_transaction_log()[-1][1]
         self.assertEqual({'new_generation': 2,
                           'new_transaction_id': last_trans_id},
-                         simplejson.loads(parts[1].rstrip(",")))
-        part2 = simplejson.loads(parts[2].rstrip(","))
+                         json.loads(parts[1].rstrip(",")))
+        part2 = json.loads(parts[2].rstrip(","))
         self.assertTrue(part2['trans_id'].startswith('T-'))
         self.assertEqual('{"value": "there"}', part2['content'])
         self.assertEqual(doc.rev, part2['rev'])
         self.assertEqual(doc.doc_id, part2['id'])
         self.assertEqual(1, part2['gen'])
-        part3 = simplejson.loads(parts[3].rstrip(","))
+        part3 = json.loads(parts[3].rstrip(","))
         self.assertTrue(part3['trans_id'].startswith('T-'))
         self.assertEqual('{"value": "there2"}', part3['content'])
         self.assertEqual(doc2.rev, part3['rev'])
@@ -875,7 +877,7 @@
 
     def test_sync_exchange_error_in_stream(self):
         args = dict(last_known_generation=0)
-        body = "[\r\n%s\r\n]" % simplejson.dumps(args)
+        body = "[\r\n%s\r\n]" % json.dumps(args)
 
         def boom(self, return_doc_cb):
             raise errors.Unavailable
@@ -893,8 +895,8 @@
         self.assertEqual(3, len(parts))
         self.assertEqual('[', parts[0])
         self.assertEqual({'new_generation': 0, 'new_transaction_id': ''},
-                         simplejson.loads(parts[1].rstrip(",")))
-        self.assertEqual({'error': 'unavailable'}, simplejson.loads(parts[2]))
+                         json.loads(parts[1].rstrip(",")))
+        self.assertEqual({'error': 'unavailable'}, json.loads(parts[2]))
 
 
 class TestRequestHooks(tests.TestCase):
@@ -981,7 +983,7 @@
         self.assertEqual(409, resp.status)
         self.assertEqual('application/json', resp.header('content-type'))
         self.assertEqual({"error": "revision conflict"},
-                         simplejson.loads(resp.body))
+                         json.loads(resp.body))
 
     def test_Unavailable(self):
         self.exc = errors.Unavailable
@@ -991,7 +993,7 @@
         self.assertEqual(503, resp.status)
         self.assertEqual('application/json', resp.header('content-type'))
         self.assertEqual({"error": "unavailable"},
-                         simplejson.loads(resp.body))
+                         json.loads(resp.body))
 
     def test_generic_u1db_errors(self):
         self.exc = errors.U1DBError()
@@ -1001,7 +1003,7 @@
         self.assertEqual(500, resp.status)
         self.assertEqual('application/json', resp.header('content-type'))
         self.assertEqual({"error": "error"},
-                         simplejson.loads(resp.body))
+                         json.loads(resp.body))
 
     def test_generic_u1db_errors_hooks(self):
         calls = []

=== modified file 'u1db/tests/test_http_client.py'
--- u1db/tests/test_http_client.py	2012-08-13 14:24:06 +0000
+++ u1db/tests/test_http_client.py	2012-08-14 14:33:39 +0000
@@ -17,7 +17,10 @@
 """Tests for HTTPDatabase"""
 
 from oauth import oauth
-import simplejson
+try:
+    import simplejson as json
+except ImportError:
+    import json  # noqa
 from wsgiref import simple_server
 
 from u1db import (
@@ -57,7 +60,7 @@
                 ret['CONTENT_TYPE'] = environ['CONTENT_TYPE']
                 content_length = int(environ['CONTENT_LENGTH'])
                 ret['body'] = environ['wsgi.input'].read(content_length)
-            return [simplejson.dumps(ret)]
+            return [json.dumps(ret)]
         elif environ['PATH_INFO'].endswith('error_then_accept'):
             if self.errors >= 3:
                 start_response(
@@ -69,10 +72,10 @@
                     ret['CONTENT_TYPE'] = environ['CONTENT_TYPE']
                     content_length = int(environ['CONTENT_LENGTH'])
                     ret['body'] = '{"oki": "doki"}'
-                return [simplejson.dumps(ret)]
+                return [json.dumps(ret)]
             self.errors += 1
             content_length = int(environ['CONTENT_LENGTH'])
-            error = simplejson.loads(
+            error = json.loads(
                 environ['wsgi.input'].read(content_length))
             response = error['response']
             # In debug mode, wsgiref has an assertion that the status parameter
@@ -86,11 +89,11 @@
                 return [str(response)]
             else:
                 start_response(status, [('Content-Type', 'application/json')])
-                return [simplejson.dumps(response)]
+                return [json.dumps(response)]
         elif environ['PATH_INFO'].endswith('error'):
             self.errors += 1
             content_length = int(environ['CONTENT_LENGTH'])
-            error = simplejson.loads(
+            error = json.loads(
                 environ['wsgi.input'].read(content_length))
             response = error['response']
             # In debug mode, wsgiref has an assertion that the status parameter
@@ -104,7 +107,7 @@
                 return [str(response)]
             else:
                 start_response(status, [('Content-Type', 'application/json')])
-                return [simplejson.dumps(response)]
+                return [json.dumps(response)]
         elif '/oauth' in environ['PATH_INFO']:
             base_url = self.getURL('').rstrip('/')
             oauth_req = oauth.OAuthRequest.from_request(
@@ -121,12 +124,10 @@
             except oauth.OAuthError, e:
                 start_response("401 Unauthorized",
                                [('Content-Type', 'application/json')])
-                return [simplejson.dumps({"error": "unauthorized",
+                return [json.dumps({"error": "unauthorized",
                                           "message": e.message})]
             start_response("200 OK", [('Content-Type', 'application/json')])
-            return [simplejson.dumps([environ['PATH_INFO'],
-                                      token.key,
-                                      params])]
+            return [json.dumps([environ['PATH_INFO'], token.key, params])]
 
     def server_def(self):
         def make_server(host_port, handler, state):
@@ -181,17 +182,17 @@
                           'PATH_INFO': '/dbase/echo',
                           'QUERY_STRING': '',
                           'body': '{}',
-                          'REQUEST_METHOD': 'PUT'}, simplejson.loads(res))
+                          'REQUEST_METHOD': 'PUT'}, json.loads(res))
 
         res, headers = cli._request('GET', ['doc', 'echo'], {'a': 1})
         self.assertEqual({'PATH_INFO': '/dbase/doc/echo',
                           'QUERY_STRING': 'a=1',
-                          'REQUEST_METHOD': 'GET'}, simplejson.loads(res))
+                          'REQUEST_METHOD': 'GET'}, json.loads(res))
 
         res, headers = cli._request('GET', ['doc', '%FFFF', 'echo'], {'a': 1})
         self.assertEqual({'PATH_INFO': '/dbase/doc/%FFFF/echo',
                           'QUERY_STRING': 'a=1',
-                          'REQUEST_METHOD': 'GET'}, simplejson.loads(res))
+                          'REQUEST_METHOD': 'GET'}, json.loads(res))
 
         res, headers = cli._request('POST', ['echo'], {'b': 2}, 'Body',
                                    'application/x-test')
@@ -199,7 +200,7 @@
                           'PATH_INFO': '/dbase/echo',
                           'QUERY_STRING': 'b=2',
                           'body': 'Body',
-                          'REQUEST_METHOD': 'POST'}, simplejson.loads(res))
+                          'REQUEST_METHOD': 'POST'}, json.loads(res))
 
     def test__request_json(self):
         cli = self.getClient()
@@ -289,7 +290,7 @@
                           {'status': "403 Forbidden",
                            'response': {"error": "user quota exceeded"}})
 
-    def test_user_quota_exceeded(self):
+    def test_user_needs_subscription(self):
         cli = self.getClient()
         self.assertRaises(errors.SubscriptionNeeded,
                           cli._request_json, 'POST', ['error'], {},
@@ -333,15 +334,15 @@
                                   tests.token1.key, tests.token1.secret)
         params = {'x': u'\xf0', 'y': "foo"}
         res, headers = cli._request('GET', ['doc', 'oauth'], params)
-        self.assertEqual(['/dbase/doc/oauth', tests.token1.key, params],
-                         simplejson.loads(res))
+        self.assertEqual(
+            ['/dbase/doc/oauth', tests.token1.key, params], json.loads(res))
 
         # oauth does its own internal quoting
         params = {'x': u'\xf0', 'y': "foo"}
         res, headers = cli._request('GET', ['doc', 'oauth', 'foo bar'], params)
         self.assertEqual(
             ['/dbase/doc/oauth/foo bar', tests.token1.key, params],
-            simplejson.loads(res))
+            json.loads(res))
 
     def test_oauth_Unauthorized(self):
         cli = self.getClient()

=== modified file 'u1db/tests/test_http_database.py'
--- u1db/tests/test_http_database.py	2012-07-19 19:50:58 +0000
+++ u1db/tests/test_http_database.py	2012-08-14 14:33:39 +0000
@@ -17,7 +17,10 @@
 """Tests for HTTPDatabase"""
 
 import inspect
-import simplejson
+try:
+    import simplejson as json
+except ImportError:
+    import json  # noqa
 
 from u1db import (
     errors,
@@ -127,7 +130,7 @@
 
     def test_get_doc_deleted_include_deleted(self):
         self.response_val = errors.HTTPError(404,
-                                             simplejson.dumps(
+                                             json.dumps(
                                              {"error": errors.DOCUMENT_DELETED}
                                              ),
                                              {'x-u1db-rev': 'doc-rev-gone',

=== modified file 'u1db/tests/test_oauth_middleware.py'
--- u1db/tests/test_oauth_middleware.py	2012-04-18 19:01:07 +0000
+++ u1db/tests/test_oauth_middleware.py	2012-08-14 14:33:39 +0000
@@ -17,7 +17,10 @@
 """Test OAuth wsgi middleware"""
 import paste.fixture
 from oauth import oauth
-import simplejson
+try:
+    import simplejson as json
+except ImportError:
+    import json  # noqa
 import time
 
 from u1db import tests
@@ -33,11 +36,13 @@
     def setUp(self):
         super(TestAuthMiddleware, self).setUp()
         self.got = []
+
         def witness_app(environ, start_response):
             start_response("200 OK", [("content-type", "text/plain")])
             self.got.append((environ['token_key'], environ['PATH_INFO'],
                              environ['QUERY_STRING']))
             return ["ok"]
+
         class MyOAuthMiddleware(OAuthMiddleware):
             get_oauth_data_store = lambda self: tests.testingOAuthStore
 
@@ -45,6 +50,7 @@
                 consumer, token = super(MyOAuthMiddleware, self).verify(
                     environ, oauth_req)
                 environ['token_key'] = token.key
+
         self.oauth_midw = MyOAuthMiddleware(witness_app, BASE_URL)
         self.app = paste.fixture.TestApp(self.oauth_midw)
 
@@ -60,9 +66,9 @@
         resp = self.app.delete(url, expect_errors=True)
         self.assertEqual(401, resp.status)
         self.assertEqual('application/json', resp.header('content-type'))
-        self.assertEqual({"error": "unauthorized",
-                          "message": "Missing OAuth."},
-                         simplejson.loads(resp.body))
+        self.assertEqual(
+            {"error": "unauthorized", "message": "Missing OAuth."},
+            json.loads(resp.body))
 
     def test_oauth_in_query_string(self):
         url = BASE_URL + '/~/foo/doc/doc-id'
@@ -97,7 +103,7 @@
                                expect_errors=True)
         self.assertEqual(401, resp.status)
         self.assertEqual('application/json', resp.header('content-type'))
-        err = simplejson.loads(resp.body)
+        err = json.loads(resp.body)
         self.assertEqual({"error": "unauthorized",
                           "message": err['message']},
                          err)
@@ -155,6 +161,6 @@
         self.oauth_midw.timestamp_threshold = 1
         resp = self.app.delete(oauth_req.to_url(), expect_errors=True)
         self.assertEqual(401, resp.status)
-        err = simplejson.loads(resp.body)
+        err = json.loads(resp.body)
         self.assertIn('Expired timestamp', err['message'])
         self.assertIn('threshold 1', err['message'])