Merge ~cjwatson/lazr.restful:remove-simplejson into lazr.restful:main

[Colin Watson]

Remove simplejson dependency

The only things that `simplejson` still gave us compared with the standard library's `json` were more consistently accepting both bytes and text input across all supported Python versions, and `simplejson.encoder.JSONEncoderForHTML`. It isn't really worth a whole dependency just for those.

[Andrey Fedoseev (andrey-fedoseev)]

LGTM

review: Approve

diff --git a/NEWS.rst b/NEWS.rst
index d1817d2..cf82019 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -2,6 +2,11 @@
 NEWS for lazr.restful
 =====================
 
+2.0.1
+=====
+
+- Remove simplejson dependency.
+
 2.0.0 (2022-06-01)
 ==================
 
diff --git a/setup.py b/setup.py
index e8602b8..e763d70 100755
--- a/setup.py
+++ b/setup.py
@@ -61,7 +61,6 @@ setup(
         "martian>=0.11",
         "pytz",
         "setuptools",
-        "simplejson>=2.1.0",
         "testtools",
         "van.testing",
         "zope.component [zcml]",
diff --git a/src/lazr/restful/_operation.py b/src/lazr/restful/_operation.py
index 7cab8ea..fdfc305 100644
--- a/src/lazr/restful/_operation.py
+++ b/src/lazr/restful/_operation.py
@@ -2,7 +2,7 @@
 
 """Base classes for one-off HTTP operations."""
 
-import simplejson
+import json
 
 from zope.component import getMultiAdapter, getUtility, queryMultiAdapter
 from zope.event import notify
@@ -138,7 +138,7 @@ class ResourceOperation(BatchingResourceMixin):
             # Serialize the result to JSON. Any embedded entries will be
             # automatically serialized.
             try:
-                result = simplejson.dumps(result, cls=ResourceJSONEncoder)
+                result = json.dumps(result, cls=ResourceJSONEncoder)
             except TypeError:
                 raise TypeError(
                     "Could not serialize object %s to JSON." % result
diff --git a/src/lazr/restful/_resource.py b/src/lazr/restful/_resource.py
index 89c005b..d6b1919 100644
--- a/src/lazr/restful/_resource.py
+++ b/src/lazr/restful/_resource.py
@@ -31,10 +31,9 @@ from email.utils import formatdate
 import copy
 import hashlib
 import html
+import json
 from operator import itemgetter
 import os
-import simplejson
-import simplejson.encoder
 import sys
 import time
 
@@ -149,7 +148,7 @@ def decode_value(value):
     elif isinstance(value, bytes):
         return value.decode("utf-8")
     else:
-        return simplejson.dumps(value, cls=ResourceJSONEncoder)
+        return json.dumps(value, cls=ResourceJSONEncoder)
 
 
 def _default_html_renderer(value):
@@ -184,10 +183,10 @@ class LazrPageTemplateFile(TrustedAppPT, PageTemplateFile):
     pass
 
 
-class ResourceJSONEncoder(simplejson.encoder.JSONEncoderForHTML):
+class ResourceJSONEncoder(json.JSONEncoder):
     """A JSON encoder for JSON-exposable resources like entry resources.
 
-    This class works with simplejson to encode objects as JSON if they
+    This class works with json to encode objects as JSON if they
     implement IJSONPublishable. All EntryResource subclasses, for
     instance, should implement IJSONPublishable.
     """
@@ -196,15 +195,41 @@ class ResourceJSONEncoder(simplejson.encoder.JSONEncoderForHTML):
         self.media_type = kwargs.pop("media_type", HTTPResource.JSON_TYPE)
         super().__init__(*args, **kwargs)
 
+    # Based on simplejson.encoder.JSONEncoderForHTML.encode.
+    def encode(self, o):
+        # Override JSONEncoder.encode because it has hacks for performance
+        # that make things more complicated.
+        chunks = self.iterencode(o, True)
+        return "".join(chunks)
+
+    # Based on simplejson.encoder.JSONEncoderForHTML.iterencode.
+    def iterencode(self, o, _one_shot=False):
+        chunks = super().iterencode(o, _one_shot)
+        for chunk in chunks:
+            # These characters should be escaped in order to embed JSON
+            # content in a <script> tag.  They cannot be escaped with the
+            # usual entities (e.g. &amp;) because they are not expanded
+            # within <script> tags.
+            chunk = chunk.replace("&", "\\u0026")
+            chunk = chunk.replace("<", "\\u003c")
+            chunk = chunk.replace(">", "\\u003e")
+
+            if not self.ensure_ascii:
+                # The line separator and paragraph separator characters are
+                # not valid in JavaScript strings.
+                chunk = chunk.replace("\u2028", "\\u2028")
+                chunk = chunk.replace("\u2029", "\\u2029")
+
+            yield chunk
+
     def default(self, obj):
         """Convert the given object to a simple data structure."""
         if isProxy(obj):
             # We have a security-proxied version of a built-in
             # type. We create a new version of the type by copying the
             # proxied version's content. That way the container is not
-            # security proxied (and simplejson will know what do do
-            # with it), but the content will still be security
-            # wrapped.
+            # security proxied (and json will know what to do with it), but
+            # the content will still be security wrapped.
             underlying_object = removeSecurityProxy(obj)
             if isinstance(underlying_object, list):
                 return list(obj)
@@ -609,7 +634,7 @@ class BatchingResourceMixin:
         if not hasattr(entries, "__len__"):
             entries = IFiniteSequence(entries)
 
-        return simplejson.dumps(len(entries))
+        return json.dumps(len(entries))
 
     def batch(self, entries, request):
         """Prepare a batch from a (possibly huge) list of entries.
@@ -661,7 +686,7 @@ class BatchingResourceMixin:
         prev_url = navigator.prevBatchURL()
         if prev_url != "":
             batch["prev_collection_link"] = prev_url
-        json_string = simplejson.dumps(batch, cls=ResourceJSONEncoder)
+        json_string = json.dumps(batch, cls=ResourceJSONEncoder)
 
         # String together a bunch of entry representations, possibly
         # obtained from a representation cache.
@@ -1022,7 +1047,7 @@ class EntryManipulatingResource(ReadWriteResource):
             self.request.response.setStatus(415)
             return None, "Expected a media type of %s." % self.JSON_TYPE
         try:
-            h = simplejson.loads(representation.decode("utf-8"))
+            h = json.loads(representation.decode("utf-8"))
         except ValueError:
             self.request.response.setStatus(400)
             return None, "Entity-body was not a well-formed JSON document."
@@ -1352,7 +1377,7 @@ class EntryFieldResource(FieldUnmarshallerMixin, EntryManipulatingResource):
             name, value = self._unmarshallField(
                 self.context.name, self.context.field, CLOSEUP_DETAIL
             )
-            return simplejson.dumps(value)
+            return json.dumps(value)
         elif media_type == self.XHTML_TYPE:
             name, value = self.unmarshallFieldToHTML(
                 self.context.name, self.context.field
@@ -1770,7 +1795,7 @@ class EntryResource(
             if representation is None:
                 # Either there is no active cache, or the representation
                 # wasn't in the cache.
-                representation = simplejson.dumps(
+                representation = json.dumps(
                     self, cls=ResourceJSONEncoder, media_type=media_type
                 )
                 # If there's an active cache, and this representation
@@ -1799,13 +1824,13 @@ class EntryResource(
                     # redact certain fields, and reserialize
                     # it. Hopefully this is faster than generating the
                     # representation from scratch!
-                    json = simplejson.loads(representation)
+                    json_representation = json.loads(representation)
                     for field in redacted_fields:
-                        json[field] = self.REDACTED_VALUE
+                        json_representation[field] = self.REDACTED_VALUE
                     # There's no need to use the ResourceJSONEncoder,
                     # because we loaded the cached representation
                     # using the standard decoder.
-                    representation = simplejson.dumps(json)
+                    representation = json.dumps(json_representation)
             return representation
         elif media_type == self.XHTML_TYPE:
             return self.toXHTML()
@@ -1883,7 +1908,7 @@ class CollectionResource(
         if request is None:
             request = self.request
         result = super().batch(entries, request)
-        result += ', "resource_type_link" : ' + simplejson.dumps(self.type_url)
+        result += ', "resource_type_link" : ' + json.dumps(self.type_url)
         return result
 
     @property
@@ -1992,7 +2017,7 @@ class ServiceRootResource(HTTPResource):
         elif media_type == self.JSON_TYPE:
             # Serve a JSON map containing links to all the top-level
             # resources.
-            result = simplejson.dumps(self, cls=ResourceJSONEncoder)
+            result = json.dumps(self, cls=ResourceJSONEncoder)
 
         self.request.response.setHeader("Content-Type", media_type)
         return result.encode("utf-8")
diff --git a/src/lazr/restful/docs/multiversion.rst b/src/lazr/restful/docs/multiversion.rst
index baeef02..d3c95d3 100644
--- a/src/lazr/restful/docs/multiversion.rst
+++ b/src/lazr/restful/docs/multiversion.rst
@@ -679,10 +679,10 @@ Beta
 
 Here's the service root resource.
 
-    >>> import simplejson
+    >>> import json
     >>> request = create_web_service_request('/beta/')
     >>> resource = request.traverse(None)
-    >>> body = simplejson.loads(resource())
+    >>> body = json.loads(resource().decode())
     >>> print(sorted(body.keys()))
     ['contacts_collection_link', 'resource_type_link']
 
@@ -701,7 +701,7 @@ absoluteURL along with the request object, and get the correct URL.
     >>> print(absoluteURL(contact_set, request))
     http://api.multiversion.dev/beta/contact_list
 
-    >>> body = simplejson.loads(resource())
+    >>> body = json.loads(resource())
     >>> body['total_size']
     3
     >>> for link in sorted(
@@ -728,7 +728,7 @@ object's URL.
     http://api.multiversion.dev/beta/contact_list/Cleo%20Python
 
     >>> from collections import OrderedDict
-    >>> body = simplejson.loads(resource(), object_pairs_hook=OrderedDict)
+    >>> body = json.loads(resource().decode(), object_pairs_hook=OrderedDict)
     >>> list(body)
     ['self_link', 'resource_type_link', 'name', 'phone', 'fax', 'http_etag']
     >>> print(body['name'])
@@ -739,19 +739,18 @@ We can traverse through an entry to one of its fields.
     >>> request_beta = create_web_service_request(
     ...     '/beta/contact_list/Cleo Python/fax')
     >>> field = request_beta.traverse(None)
-    >>> print(simplejson.loads(field()))
+    >>> print(json.loads(field().decode()))
     111-2121
 
 We can invoke a named operation, and it returns a total_size (because
 'beta' is an earlier version than the
 first_version_with_total_size_link).
 
-    >>> import simplejson
     >>> request_beta = create_web_service_request(
     ...     '/beta/contact_list',
     ...     environ={'QUERY_STRING' : 'ws.op=findContacts&string=Cleo'})
     >>> operation = request_beta.traverse(None)
-    >>> result = simplejson.loads(operation())
+    >>> result = json.loads(operation())
     >>> [contact['name'] for contact in result['entries']]
     ['Cleo Python']
 
@@ -763,7 +762,7 @@ first_version_with_total_size_link).
     ...     environ={'QUERY_STRING' : 'ws.op=findContacts&string=111'})
 
     >>> operation = request_beta.traverse(None)
-    >>> result = simplejson.loads(operation())
+    >>> result = json.loads(operation())
     >>> [contact['fax'] for contact in result['entries']]
     ['111-2121']
 
@@ -772,10 +771,9 @@ first_version_with_total_size_link).
 
 Here's the service root resource.
 
-    >>> import simplejson
     >>> request = create_web_service_request('/1.0/')
     >>> resource = request.traverse(None)
-    >>> body = simplejson.loads(resource())
+    >>> body = json.loads(resource().decode())
     >>> print(sorted(body.keys()))
     ['contacts_collection_link', 'resource_type_link']
 
@@ -802,7 +800,7 @@ Here's the contact list under its correct URL.
     >>> print(absoluteURL(contact_set, request))
     http://api.multiversion.dev/1.0/contacts
 
-    >>> body = simplejson.loads(resource())
+    >>> body = json.loads(resource())
     >>> body['total_size']
     3
     >>> for link in sorted(
@@ -823,7 +821,7 @@ We can traverse through the collection to an entry.
 Note that the 'fax' and 'phone' fields are now called 'fax_number' and
 'phone_number'.
 
-    >>> body = simplejson.loads(resource(), object_pairs_hook=OrderedDict)
+    >>> body = json.loads(resource().decode(), object_pairs_hook=OrderedDict)
     >>> list(body)
     ['self_link', 'resource_type_link', 'name', 'phone_number', 'fax_number',
      'http_etag']
@@ -835,7 +833,7 @@ We can traverse through an entry to one of its fields.
     >>> request_10 = create_web_service_request(
     ...     '/1.0/contacts/Cleo Python/fax_number')
     >>> field = request_10.traverse(None)
-    >>> print(simplejson.loads(field()))
+    >>> print(json.loads(field().decode()))
     111-2121
 
 The fax field in '1.0' is called 'fax_number', and attempting
@@ -858,7 +856,7 @@ first_version_with_total_size_link.
     ...     '/1.0/contacts',
     ...     environ={'QUERY_STRING' : 'ws.op=find&string=e&ws.size=2'})
     >>> operation = request_10.traverse(None)
-    >>> result = simplejson.loads(operation())
+    >>> result = json.loads(operation())
     >>> [contact['name'] for contact in result['entries']]
     ['Cleo Python', 'Oliver Bluth']
 
@@ -874,7 +872,7 @@ first_version_with_total_size_link.
     ...     environ={'QUERY_STRING' :
     ...         'string=e&ws.op=find&ws.show=total_size'})
     >>> operation = size_request.traverse(None)
-    >>> result = simplejson.loads(operation())
+    >>> result = json.loads(operation())
     >>> print(result)
     3
 
@@ -885,7 +883,7 @@ instead of total_size_link, as a convenience.
     ...     '/1.0/contacts',
     ...     environ={'QUERY_STRING' : 'ws.op=find&string=111'})
     >>> operation = request_10.traverse(None)
-    >>> result = simplejson.loads(operation())
+    >>> result = json.loads(operation())
     >>> [contact['fax_number'] for contact in result['entries']]
     ['111-2121']
     >>> result['total_size']
@@ -907,7 +905,7 @@ Here's the service root resource.
 
     >>> request = create_web_service_request('/dev/')
     >>> resource = request.traverse(None)
-    >>> body = simplejson.loads(resource())
+    >>> body = json.loads(resource().decode())
     >>> print(sorted(body.keys()))
     ['contacts_collection_link', 'resource_type_link']
 
@@ -921,7 +919,7 @@ Here's the contact list.
     >>> print(absoluteURL(contact_set, request_dev))
     http://api.multiversion.dev/dev/contacts
 
-    >>> body = simplejson.loads(resource())
+    >>> body = json.loads(resource())
     >>> body['total_size']
     2
     >>> for link in sorted(
@@ -942,7 +940,7 @@ Note that the published field names have changed between 'dev' and
 '1.0'. The phone field is still 'phone_number', but the 'fax_number'
 field is gone.
 
-    >>> body = simplejson.loads(resource(), object_pairs_hook=OrderedDict)
+    >>> body = json.loads(resource().decode(), object_pairs_hook=OrderedDict)
     >>> list(body)
     ['self_link', 'resource_type_link', 'name', 'phone_number', 'http_etag']
     >>> print(body['name'])
@@ -953,7 +951,7 @@ We can traverse through an entry to one of its fields.
     >>> request_dev = create_web_service_request(
     ...     '/dev/contacts/Cleo Python/name')
     >>> field = request_dev.traverse(None)
-    >>> print(simplejson.loads(field()))
+    >>> print(json.loads(field().decode()))
     Cleo Python
 
 We cannot use 'dev' to traverse to a field not published in the 'dev'
@@ -981,7 +979,7 @@ We can invoke a named operation.
     ...     '/dev/contacts',
     ...     environ={'QUERY_STRING' : 'ws.op=find&string=Cleo'})
     >>> operation = request_dev.traverse(None)
-    >>> result = simplejson.loads(operation())
+    >>> result = json.loads(operation())
     >>> [contact['name'] for contact in result['entries']]
     ['Cleo Python']
 
@@ -993,6 +991,6 @@ service doesn't search the fax field.
     ...     '/dev/contacts',
     ...     environ={'QUERY_STRING' : 'ws.op=find&string=111'})
     >>> operation = request_dev.traverse(None)
-    >>> result = simplejson.loads(operation())
+    >>> result = json.loads(operation())
     >>> [entry for entry in result['entries']]
     []
diff --git a/src/lazr/restful/docs/webservice-declarations.rst b/src/lazr/restful/docs/webservice-declarations.rst
index 447aa49..be31dde 100644
--- a/src/lazr/restful/docs/webservice-declarations.rst
+++ b/src/lazr/restful/docs/webservice-declarations.rst
@@ -1187,9 +1187,9 @@ Now we can create a fake request that invokes the named operation.
 Since the method is declared as returning a list of objects, the
 return value is a dictionary containing a batched list.
 
-    >>> import simplejson
+    >>> import json
     >>> for key, value in sorted(
-    ...         simplejson.loads(read_method_adapter.call(text='')).items()):
+    ...         json.loads(read_method_adapter.call(text='')).items()):
     ...     print('%s: %s' % (key, value))
     entries: []
     start: 0
diff --git a/src/lazr/restful/docs/webservice.rst b/src/lazr/restful/docs/webservice.rst
index d10d4a3..477b762 100644
--- a/src/lazr/restful/docs/webservice.rst
+++ b/src/lazr/restful/docs/webservice.rst
@@ -1087,9 +1087,9 @@ The response document is a JSON document full of links to the
 top-level collections of authors, cookbooks, and dishes. It's the
 'home page' for the web service.
 
-    >>> import simplejson
+    >>> import json
     >>> response = app(request)
-    >>> representation = simplejson.loads(response)
+    >>> representation = json.loads(response.decode())
 
     >>> print(representation["authors_collection_link"])
     http://api.cookbooks.dev/beta/authors
@@ -1164,7 +1164,9 @@ parsed with standard tools.
 
     >>> def load_json(s):
     ...     """Convert a JSON string to Unicode and then load it."""
-    ...     return simplejson.loads(s)
+    ...     if isinstance(s, bytes):
+    ...         s = s.decode()
+    ...     return json.loads(s)
 
     >>> representation = load_json(collection())
     >>> print(representation['resource_type_link'])
@@ -1589,7 +1591,7 @@ a JSON hash containing a list of entries.
     >>> recipes = StubResultSet()
     >>> request, operation = make_sample_operation_request(recipes)
     >>> response = operation()
-    >>> pprint_collection(simplejson.loads(response))
+    >>> pprint_collection(json.loads(response))
     start: ...
     total_size: 2
     ---
@@ -1604,7 +1606,7 @@ batch from the collection.
 
     >>> request, operation = make_sample_operation_request(DishSet())
     >>> response = operation()
-    >>> pprint_collection(simplejson.loads(response))
+    >>> pprint_collection(json.loads(response))
     resource_type_link: 'http://api.cookbooks.dev/beta/#dishes'
     start: ...
     total_size: 3
@@ -1818,7 +1820,7 @@ server. The server will know that the client isn't actually trying to
 set the field value to 'tag:launchpad.net:2008:redacted'.
 
     >>> headers = {'CONTENT_TYPE' : 'application/json'}
-    >>> body = simplejson.dumps(author).encode()
+    >>> body = json.dumps(author).encode()
     >>> put_request = create_web_service_request(
     ...     beard_url, body=body, environ=headers, method='PUT')
     >>> print(put_request.traverse(app)().decode())
@@ -1831,7 +1833,7 @@ PUT, even when its current value is redacted.
     >>> author['favorite_recipe_link'] = 'http://' + quote(
     ...     'api.cookbooks.dev/beta/cookbooks/'
     ...     'The Joy of Cooking/recipes/Roast chicken')
-    >>> body = simplejson.dumps(author).encode()
+    >>> body = json.dumps(author).encode()
     >>> put_request = create_web_service_request(
     ...     beard_url, body=body, environ=headers, method='PUT')
     >>> print(put_request.traverse(app)().decode())
@@ -1851,7 +1853,7 @@ permission to see:
 
     >>> author['favorite_recipe_link'] = (
     ...     'http://api.cookbooks.dev' + private_recipe_url)
-    >>> body = simplejson.dumps(author).encode()
+    >>> body = json.dumps(author).encode()
     >>> put_request = create_web_service_request(
     ...     beard_url, body=body, environ=headers, method='PUT')
     >>> print(put_request.traverse(app)())
@@ -2019,7 +2021,7 @@ server. Note also that another modification event is sent out and
 intercepted by the modified_cookbook() listener.
 
     >>> joy['name'] = 'The Joy of Cooking'
-    >>> body = simplejson.dumps(joy).encode()
+    >>> body = json.dumps(joy).encode()
     >>> put_request = create_web_service_request(
     ...     '/beta/cookbooks/The%20Joy%20of%20Cooking%20%28revised%29',
     ...     body=body, environ=headers, method='PUT')
@@ -2058,7 +2060,7 @@ their URLs, we make the change by modifying the cookbook's
     ...     representation = {'author_link' : new_author_link}
     ...     resource = create_web_service_request(
     ...         '/beta/cookbooks/The%20Joy%20of%20Cooking',
-    ...         body=simplejson.dumps(representation).encode(),
+    ...         body=json.dumps(representation).encode(),
     ...         environ=headers, method='PATCH', hostname=host).traverse(app)
     ...     result = resource()
     ...     if isinstance(result, bytes):
diff --git a/src/lazr/restful/example/base/tests/collection.txt b/src/lazr/restful/example/base/tests/collection.txt
index 44065aa..2660d29 100644
--- a/src/lazr/restful/example/base/tests/collection.txt
+++ b/src/lazr/restful/example/base/tests/collection.txt
@@ -165,10 +165,10 @@ custom operation to be invoked is named in the query string's
 'ws.op' argument. Here's a custom operation on the collection of
 cookbooks, called 'find_recipes'.
 
-    >>> import simplejson
+    >>> import json
     >>> def search_recipes(text, vegetarian=False, start=0, size=2):
     ...     args = ("&search=%s&vegetarian=%s&ws.start=%s&ws.size=%s" %
-    ...             (quote(text), simplejson.dumps(vegetarian), start, size))
+    ...             (quote(text), json.dumps(vegetarian), start, size))
     ...     return webservice.get(
     ...         "/cookbooks?ws.op=find_recipes&%s" % args).jsonBody()
 
diff --git a/src/lazr/restful/example/base/tests/entry.txt b/src/lazr/restful/example/base/tests/entry.txt
index decab39..045bd14 100644
--- a/src/lazr/restful/example/base/tests/entry.txt
+++ b/src/lazr/restful/example/base/tests/entry.txt
@@ -279,10 +279,10 @@ Custom operations may have error handling.
     The 'New' trick can't be used on this cookbook because its
     name already starts with 'The New'.
 
-    >>> import simplejson
+    >>> import json
     >>> ignore = webservice.patch(
     ...     new_joy_url, 'application/json',
-    ...     simplejson.dumps({"name": "The Joy of Cooking"}))
+    ...     json.dumps({"name": "The Joy of Cooking"}))
 
 Trying to invoke a nonexistent custom operation yields an error.
 
@@ -306,8 +306,7 @@ entry's state, in which case the client should use PUT.
     ...     new_headers = {'Content-type': 'application/json'}
     ...     if headers is not None:
     ...         new_headers.update(headers)
-    ...     return webservice(
-    ...         url, method, simplejson.dumps(representation), headers)
+    ...     return webservice(url, method, json.dumps(representation), headers)
 
     >>> def modify_cookbook(cookbook, representation, method, headers=None):
     ...     "A helper function to PUT or PATCH a cookbook."
@@ -509,7 +508,7 @@ will be the new representation, modified by both client and server.
 
     >>> greens = webservice(
     ...     greens_url, "PATCH",
-    ...     simplejson.dumps({'description' : '  A description '}),
+    ...     json.dumps({'description' : '  A description '}),
     ...     {'Content-type': 'application/json'}).jsonBody()
     >>> print(greens['description'])
     A description
@@ -519,7 +518,7 @@ will be the new representation, modified by both client and server.
 The canonicalization works for PUT requests as well.
 
     >>> greens['description'] = "    Another description  "
-    >>> greens = webservice(greens_url, "PUT", simplejson.dumps(greens),
+    >>> greens = webservice(greens_url, "PUT", json.dumps(greens),
     ...                     {'Content-type': 'application/json'}).jsonBody()
     >>> print(greens['description'])
     Another description
@@ -775,8 +774,7 @@ for.
 
     >>> def modify_dish(url, recipe, new_dish_url):
     ...     recipe['dish_link'] = new_dish_url
-    ...     return webservice.put(
-    ...         url, 'application/json', simplejson.dumps(recipe))
+    ...     return webservice.put(url, 'application/json', json.dumps(recipe))
 
     >>> new_dish = webservice.get(quote('/dishes/Baked beans')).jsonBody()
     >>> new_dish_url = new_dish['self_link']
@@ -1011,7 +1009,7 @@ A recipe has a 'dish_link', but it doesn't have a 'dish' directly.
 
     >>> url = quote('/cookbooks/The Joy of Cooking/Roast chicken')
     >>> print(webservice.patch(url, 'application/json',
-    ...     simplejson.dumps({'dish' : 'placeholder'})))
+    ...     json.dumps({'dish' : 'placeholder'})))
     HTTP/1.1 400 Bad Request
     ...
     dish: You tried to modify a nonexistent attribute.
diff --git a/src/lazr/restful/example/base/tests/field.txt b/src/lazr/restful/example/base/tests/field.txt
index 0f6951f..ca6ec54 100644
--- a/src/lazr/restful/example/base/tests/field.txt
+++ b/src/lazr/restful/example/base/tests/field.txt
@@ -12,11 +12,11 @@ field resource itself, rather than PUT/PATCH to the entry.
     >>> cookbook_url = quote("/cookbooks/The Joy of Cooking")
     >>> field_url = cookbook_url + "/description"
 
-    >>> import simplejson
+    >>> import json
     >>> def set_description(description):
     ...     """Sets the description for "The Joy of Cooking"."""
     ...     return webservice(field_url, 'PATCH',
-    ...                       simplejson.dumps(description)).jsonBody()
+    ...                       json.dumps(description)).jsonBody()
 
     >>> print(set_description("New description"))
     New description
@@ -30,7 +30,7 @@ field resource itself, rather than PUT/PATCH to the entry.
 
 PATCH on a field resource works identically to PUT.
 
-    >>> representation = simplejson.dumps('<b>Bold description</b>')
+    >>> representation = json.dumps('<b>Bold description</b>')
     >>> print(webservice.put(field_url, 'application/json',
     ...                      representation).jsonBody())
     <b>Bold description</b>
@@ -50,7 +50,7 @@ the link, rather than the actual object.
 Changing a field resource that contains a link works the same way as
 changing a field resource that contains a scalar value.
 
-    >>> new_value = simplejson.dumps(
+    >>> new_value = json.dumps(
     ...     webservice.get(cookbook_url).jsonBody()['self_link'])
     >>> print(new_value)
     "http://.../cookbooks/The%20Joy%20of%20Cooking"
@@ -68,7 +68,7 @@ the entry as a whole or just modifying a single field.
 
     >>> date_field_url = cookbook_url + "/copyright_date"
     >>> print(webservice.put(date_field_url, 'application/json',
-    ...                      simplejson.dumps("string")))
+    ...                      json.dumps("string")))
     HTTP/1.1 400 Bad Request
     ...
     copyright_date: Value doesn't look like a date.
@@ -103,7 +103,7 @@ a cookbook's name), the field's URL will change. You'll be redirected
 to the new field URL.
 
     >>> name_url = cookbook_url + "/name"
-    >>> representation = simplejson.dumps("The Joy of Cooking Extreme")
+    >>> representation = json.dumps("The Joy of Cooking Extreme")
     >>> print(webservice.put(name_url, 'application/json',
     ...                      representation))
     HTTP/1.1 301 Moved Permanently
@@ -124,7 +124,7 @@ Note that the entry's URL has also changed.
 
 Cleanup.
 
-    >>> representation = simplejson.dumps("The Joy of Cooking")
+    >>> representation = json.dumps("The Joy of Cooking")
     >>> new_name_url = new_cookbook_url + "/name"
     >>> print(webservice.put(new_name_url, 'application/json',
     ...                      representation))
@@ -240,7 +240,7 @@ do.
 The first attempt to modify the field succeeds, because the ETag
 provided in If-Match is the one we just got from a GET request.
 
-    >>> representation = simplejson.dumps("New description")
+    >>> representation = json.dumps("New description")
     >>> print(webservice.put(field_url, 'application/json',
     ...                      representation,
     ...                      headers={'If-Match': cookbook_etag}))
@@ -348,13 +348,13 @@ the "include=lp_html" parameter on the application/json media type.
 
 The cookbook's description is a normal JSON representation...
 
-  >>> json = response.jsonBody()
-  >>> print(json['description'])
+  >>> json_body = response.jsonBody()
+  >>> print(json_body['description'])
   Description
 
 ...but the JSON dictionary will include a 'lp_html' sub-dictionary...
 
-  >>> html = json['lp_html']
+  >>> html = json_body['lp_html']
 
 ...which includes HTML representations of the fields with HTML
 representations:
diff --git a/src/lazr/restful/example/base/tests/hostedfile.txt b/src/lazr/restful/example/base/tests/hostedfile.txt
index 53ff057..6cafe8d 100644
--- a/src/lazr/restful/example/base/tests/hostedfile.txt
+++ b/src/lazr/restful/example/base/tests/hostedfile.txt
@@ -154,9 +154,9 @@ owns the file.
 
     >>> greens['cover_link'] = 'http://google.com/logo.png'
 
-    >>> import simplejson
+    >>> import json
     >>> print(webservice.put(greens_url, 'application/json',
-    ...     simplejson.dumps(greens)))
+    ...     json.dumps(greens)))
     HTTP/1.1 400 Bad Request
     ...
     cover_link: To modify this field you need to send a PUT request to its
diff --git a/src/lazr/restful/example/base/tests/representation-cache.txt b/src/lazr/restful/example/base/tests/representation-cache.txt
index 0b6a340..d67ee0b 100644
--- a/src/lazr/restful/example/base/tests/representation-cache.txt
+++ b/src/lazr/restful/example/base/tests/representation-cache.txt
@@ -41,14 +41,15 @@ under a key derived from the object whose representation it is, the
 media type of the representation, and a web service version name.
 
     >>> from lazr.restful.example.base.root import C4 as greens_object
-    >>> json = "application/json"
-    >>> print(cache.get(greens_object, json, "devel"))
+    >>> json_ct = "application/json"
+    >>> print(cache.get(greens_object, json_ct, "devel"))
     None
-    >>> print(cache.get(greens_object, json, "devel", "missing"))
+    >>> print(cache.get(greens_object, json_ct, "devel", "missing"))
     missing
 
-    >>> cache.set(greens_object, json, "devel", "This is the 'devel' value.")
-    >>> print(cache.get(greens_object, json, "devel"))
+    >>> cache.set(
+    ...     greens_object, json_ct, "devel", "This is the 'devel' value.")
+    >>> print(cache.get(greens_object, json_ct, "devel"))
     This is the 'devel' value.
     >>> sorted(dictionary.keys())
     ['http://cookbooks.dev/devel/cookbooks/Everyday%20Greens,application/json']
@@ -56,8 +57,8 @@ media type of the representation, and a web service version name.
 This allows different representations of the same object to be stored
 for different versions.
 
-    >>> cache.set(greens_object, json, "1.0", "This is the '1.0' value.")
-    >>> print(cache.get(greens_object, json, "1.0"))
+    >>> cache.set(greens_object, json_ct, "1.0", "This is the '1.0' value.")
+    >>> print(cache.get(greens_object, json_ct, "1.0"))
     This is the '1.0' value.
     >>> sorted(dictionary.keys())
     ['http://cookbooks.dev/1.0/cookbooks/Everyday%20Greens,application/json',
@@ -68,9 +69,9 @@ Deleting an object from the cache will remove all its representations.
     >>> cache.delete(greens_object)
     >>> sorted(dictionary.keys())
     []
-    >>> print(cache.get(greens_object, json, "devel"))
+    >>> print(cache.get(greens_object, json_ct, "devel"))
     None
-    >>> print(cache.get(greens_object, json, "1.0"))
+    >>> print(cache.get(greens_object, json_ct, "1.0"))
     None
 
 DO_NOT_CACHE
@@ -93,8 +94,8 @@ object+type+version combination will not be cached at all.
 The key_for() implementation defined above will not cache a
 representation of the string "Don't cache this."
 
-    >>> test_cache.set("Cache this.", json, "1.0", "representation")
-    >>> test_cache.set("Don't cache this.", json, "1.0", "representation")
+    >>> test_cache.set("Cache this.", json_ct, "1.0", "representation")
+    >>> test_cache.set("Don't cache this.", json_ct, "1.0", "representation")
     >>> for key in test_dict:
     ...     print(key)
     Cache this.,application/json,1.0
@@ -102,7 +103,7 @@ representation of the string "Don't cache this."
 ...UNLESS the representation being cached is for the version "cache
 everything!"
 
-    >>> test_cache.set("Don't cache this.", json, "cache everything!",
+    >>> test_cache.set("Don't cache this.", json_ct, "cache everything!",
     ...                "representation")
     >>> for key in sorted(test_dict.keys()):
     ...     print(key)
@@ -114,7 +115,7 @@ retrievable.
 
     >>> bad_key = "Don't cache this.,application/json,1.0"
     >>> test_dict[bad_key] = "This representation should not be cached."
-    >>> print(test_cache.get("Don't cache this.", json, "1.0"))
+    >>> print(test_cache.get("Don't cache this.", json_ct, "1.0"))
     None
 
 A representation cache
@@ -146,8 +147,8 @@ Note that the cache key incorporates the web service version name
 
 Associated with the key is a string: the JSON representation of the object.
 
-    >>> import simplejson
-    >>> print(simplejson.loads(dictionary[the_only_key])['self_link'])
+    >>> import json
+    >>> print(json.loads(dictionary[the_only_key])['self_link'])
     http://cookbooks.dev/devel/recipes/1
 
 If we get a representation of the same resource from a different web
@@ -179,7 +180,7 @@ previously cached representation.
     >>> print(old_instructions)
     You can always judge...
     >>> response = webservice.patch(recipe_url, 'application/json',
-    ...     simplejson.dumps(dict(instructions="New instructions")),
+    ...     json.dumps(dict(instructions="New instructions")),
     ...     api_version='devel')
     >>> print(response.status)
     209
@@ -190,8 +191,8 @@ The modified representation is immediately available in the cache.
 
     >>> from lazr.restful.example.base.root import RECIPES
     >>> recipe = [recipe for recipe in RECIPES if recipe.id == 1][0]
-    >>> cached_representation = cache.get(recipe, json, 'devel')
-    >>> print(simplejson.loads(cached_representation)['instructions'])
+    >>> cached_representation = cache.get(recipe, json_ct, 'devel')
+    >>> print(json.loads(cached_representation)['instructions'])
     New instructions
 
 Cleanup.
@@ -207,7 +208,7 @@ POST did.
     >>> from lazr.restful.example.base.root import COOKBOOKS
     >>> cookbook = [cookbook for cookbook in COOKBOOKS
     ...             if cookbook.name == "Everyday Greens"][0]
-    >>> cache.set(cookbook, json, 'devel', "Sample value.")
+    >>> cache.set(cookbook, json_ct, 'devel', "Sample value.")
     >>> print(list(dictionary.keys())[0])
     http://.../devel/cookbooks/Everyday%20Greens,application/json
 
@@ -233,13 +234,13 @@ To remove an object's representation from the cache, we pass it into
 the cache's delete() method.
 
     >>> ignore = webservice.get(recipe_url, api_version='devel')
-    >>> print(cache.get(recipe, json, 'devel'))
+    >>> print(cache.get(recipe, json_ct, 'devel'))
     {...}
     >>> cache.delete(recipe)
 
 This deletes all the relevant representations.
 
-    >>> print(cache.get(recipe, json, 'devel'))
+    >>> print(cache.get(recipe, json_ct, 'devel'))
     None
     >>> list(dictionary)
     []
@@ -267,10 +268,9 @@ What if a full representation is in the cache, and the user requests a
 representation that must be redacted? Let's put some semi-fake data in
 the cache and find out.
 
-    >>> import simplejson
     >>> greens['name'] = "This comes from the cache; it is not generated."
     >>> greens['confirmed'] = True
-    >>> cache.set(greens_object, json, 'devel', simplejson.dumps(greens))
+    >>> cache.set(greens_object, json_ct, 'devel', json.dumps(greens))
 
 When we GET the corresponding resource, we get a representation that
 definitely comes from the cache, not the original data source.
@@ -342,7 +342,7 @@ First, we'll hack the cached representation of a single recipe.
     >>> recipe = webservice.get("/recipes/1").jsonBody()
     >>> recipe['instructions'] = "This representation is from the cache."
     >>> [recipe_key] = dictionary.keys()
-    >>> dictionary[recipe_key] = simplejson.dumps(recipe)
+    >>> dictionary[recipe_key] = json.dumps(recipe)
 
 Now, we get the collection of recipes.
 
@@ -374,9 +374,9 @@ If we request the collection again, all the entry representations will
 come from the cache.
 
     >>> for key in dictionary.keys():
-    ...     value = simplejson.loads(dictionary[key])
+    ...     value = json.loads(dictionary[key])
     ...     value['instructions'] = "This representation is from the cache."
-    ...     dictionary[key] = simplejson.dumps(value)
+    ...     dictionary[key] = json.dumps(value)
 
     >>> recipes = webservice.get("/recipes").jsonBody()['entries']
     >>> for instructions in (
diff --git a/src/lazr/restful/example/multiversion/tests/introduction.txt b/src/lazr/restful/example/multiversion/tests/introduction.txt
index f01eba6..fd85c3b 100644
--- a/src/lazr/restful/example/multiversion/tests/introduction.txt
+++ b/src/lazr/restful/example/multiversion/tests/introduction.txt
@@ -124,7 +124,7 @@ interesting properties.
 The 'comment' field is not modified directly, but by internal mutator
 methods which append some useless text to your comment.
 
-    >>> import simplejson
+    >>> import json
     >>> def get_comment(version):
     ...     response = webservice.get("/pairs/foo", api_version=version)
     ...     return response.jsonBody()['comment']
@@ -132,7 +132,7 @@ methods which append some useless text to your comment.
     >>> def change_comment(comment, version, get_comment_afterwards=True):
     ...     ignored = webservice.patch(
     ...         "/pairs/foo/", 'application/json',
-    ...         simplejson.dumps({"comment": comment}),
+    ...         json.dumps({"comment": comment}),
     ...         api_version=version)
     ...     if get_comment_afterwards:
     ...         return get_comment(version)
diff --git a/src/lazr/restful/marshallers.py b/src/lazr/restful/marshallers.py
index 2ca4e34..1f28fdd 100644
--- a/src/lazr/restful/marshallers.py
+++ b/src/lazr/restful/marshallers.py
@@ -24,11 +24,11 @@ __all__ = [
 from collections import OrderedDict
 from datetime import datetime
 from io import BytesIO
+import json
 import re
 from urllib.parse import unquote
 
 import pytz
-import simplejson
 
 from zope.datetime import (
     DateTimeError,
@@ -190,7 +190,7 @@ class SimpleFieldMarshaller:
                     v = v.decode("utf8")  # assume utf8
                 elif not isinstance(v, str):
                     v = str(v)
-                value = simplejson.loads(v)
+                value = json.loads(v)
             except (ValueError, TypeError):
                 # Pass the value as is. This saves client from having to encode
                 # strings.
diff --git a/src/lazr/restful/publisher.py b/src/lazr/restful/publisher.py
index 67e4ea0..2680999 100644
--- a/src/lazr/restful/publisher.py
+++ b/src/lazr/restful/publisher.py
@@ -12,13 +12,13 @@ __all__ = [
     "WebServiceRequestTraversal",
 ]
 
+import json
 from urllib.parse import (
     quote,
     urlsplit,
     urlunsplit,
 )
 
-import simplejson
 from zope.component import (
     adapter,
     getMultiAdapter,
@@ -213,7 +213,7 @@ class WebServicePublicationMixin:
                 (notification.level, notification.message)
                 for notification in notifications_provider.notifications
             ]
-        json_notifications = simplejson.dumps(notifications)
+        json_notifications = json.dumps(notifications)
         request.response.setHeader("X-Lazr-Notifications", json_notifications)
 
     def callObject(self, request, object):
diff --git a/src/lazr/restful/tales.py b/src/lazr/restful/tales.py
index 6b975fe..74e51d2 100644
--- a/src/lazr/restful/tales.py
+++ b/src/lazr/restful/tales.py
@@ -26,9 +26,9 @@
 
 """Implementation of the ws: namespace in TALES."""
 
+import json
 import operator
 import re
-import simplejson
 import textwrap
 from urllib.parse import quote
 
@@ -339,7 +339,7 @@ class WebLayerAPI:
         else:
             # Just dump it as JSON+XHTML
             resource = self.context
-        return simplejson.dumps(
+        return json.dumps(
             resource,
             cls=ResourceJSONEncoder,
             media_type=EntryResource.JSON_TYPE,
diff --git a/src/lazr/restful/testing/webservice.py b/src/lazr/restful/testing/webservice.py
index af7496b..1de10b6 100644
--- a/src/lazr/restful/testing/webservice.py
+++ b/src/lazr/restful/testing/webservice.py
@@ -21,9 +21,9 @@ __all__ = [
 from collections import OrderedDict
 from email.utils import quote as email_quote
 import io
+import json
 import random
 import re
-import simplejson
 import sys
 from types import ModuleType
 import unittest
@@ -455,7 +455,7 @@ class WebServiceCaller:
                 buf.write(value.read())
             else:
                 if not isinstance(value, str):
-                    value = simplejson.dumps(value)
+                    value = json.dumps(value)
                 lines = re.split(r"\r\n|\r|\n", value)
                 for line in lines[:-1]:
                     buf.write(line.encode())
@@ -523,7 +523,7 @@ class WebServiceCaller:
         This may mean turning the value into a JSON string.
         """
         if not isinstance(value, str):
-            value = simplejson.dumps(value)
+            value = json.dumps(value)
         return quote(value)
 
     def _make_request_with_entity_body(
@@ -583,7 +583,7 @@ class WebServiceResponseWrapper(ProxyBase):
         if isinstance(body, bytes):
             body = body.decode()
         try:
-            return simplejson.loads(body, object_pairs_hook=OrderedDict)
+            return json.loads(body, object_pairs_hook=OrderedDict)
         except ValueError:
             # Return a useful ValueError that displays the problematic
             # string, instead of one that just says the string wasn't
diff --git a/src/lazr/restful/tests/test_webservice.py b/src/lazr/restful/tests/test_webservice.py
index b762b2c..3d1e9a0 100644
--- a/src/lazr/restful/tests/test_webservice.py
+++ b/src/lazr/restful/tests/test_webservice.py
@@ -7,14 +7,14 @@ from io import (
     BytesIO,
     StringIO,
 )
-from lxml import etree
 import collections
+import json
 import logging
 import random
 import re
-import simplejson
 import unittest
 
+from lxml import etree
 from zope.component import (
     eventtesting,
     getGlobalSiteManager,
@@ -455,8 +455,8 @@ class TestEntryWrite(EntryTestCase):
 
         with self.entry_resource(HasOneField, "") as resource:
             existing_web_link = resource.toDataForJSON()["web_link"]
-            representation = simplejson.loads(
-                resource.applyChanges({"web_link": existing_web_link})
+            representation = json.loads(
+                resource.applyChanges({"web_link": existing_web_link}).decode()
             )
             self.assertEqual(representation["web_link"], existing_web_link)
 
@@ -467,7 +467,7 @@ class TestEntryWrite(EntryTestCase):
 
         with self.entry_resource(HasOneField, "") as resource:
             existing_representation = resource.toDataForJSON()
-            representation = simplejson.loads(resource.applyChanges({}))
+            representation = json.loads(resource.applyChanges({}).decode())
             self.assertEqual(representation, existing_representation)
 
     def test_applyChanges_returns_modified_representation_on_change(self):
@@ -490,8 +490,8 @@ class TestEntryWrite(EntryTestCase):
                 "initial value", resource.toDataForJSON()["field"]
             )
             # This returns the changed value.
-            representation = simplejson.loads(
-                resource.applyChanges(dict(field="new value"))
+            representation = json.loads(
+                resource.applyChanges(dict(field="new value")).decode()
             )
             self.assertEqual("new value", representation["field"])
 
@@ -594,13 +594,13 @@ class JSONPlusHTMLRepresentationTest(EntryTestCase):
         self.default_media_type = "application/json"
         self.register_html_field_renderer()
         with self.resource() as resource:
-            json = simplejson.loads(resource.do_GET())
-            self.assertFalse("lp_html" in json)
+            json_representation = json.loads(resource.do_GET().decode())
+            self.assertFalse("lp_html" in json_representation)
 
     def test_entry_with_no_html_renderers_omits_lp_html(self):
         with self.resource() as resource:
-            json = simplejson.loads(resource.do_GET())
-            self.assertFalse("lp_html" in json)
+            json_representation = json.loads(resource.do_GET().decode())
+            self.assertFalse("lp_html" in json_representation)
             self.assertEqual(
                 resource.request.response.getHeader("Content-Type"),
                 "application/json",
@@ -609,8 +609,8 @@ class JSONPlusHTMLRepresentationTest(EntryTestCase):
     def test_field_specific_html_renderer_shows_up_in_lp_html(self):
         self.register_html_field_renderer("a_field")
         with self.resource() as resource:
-            json = simplejson.loads(resource.do_GET())
-            html = json["lp_html"]
+            json_representation = json.loads(resource.do_GET().decode())
+            html = json_representation["lp_html"]
             self.assertEqual(
                 html["a_field"], simple_renderer(resource.entry.a_field)
             )
@@ -622,8 +622,8 @@ class JSONPlusHTMLRepresentationTest(EntryTestCase):
     def test_html_renderer_for_class_renders_all_fields_of_that_class(self):
         self.register_html_field_renderer()
         with self.resource() as resource:
-            json = simplejson.loads(resource.do_GET())
-            html = json["lp_html"]
+            json_representation = json.loads(resource.do_GET().decode())
+            html = json_representation["lp_html"]
             self.assertEqual(
                 html["a_field"], simple_renderer(resource.entry.a_field)
             )
@@ -643,23 +643,23 @@ class JSONPlusHTMLRepresentationTest(EntryTestCase):
         # The lp_html portion of the representation is ignored during
         # writes.
         self.register_html_field_renderer()
-        json = None
+        json_representation = None
         with self.resource() as resource:
             json_plus_xhtml = resource.JSON_PLUS_XHTML_TYPE
-            json = simplejson.loads(
+            json_representation = json.loads(
                 str(resource._representation(json_plus_xhtml))
             )
-            resource.applyChanges(json, json_plus_xhtml)
+            resource.applyChanges(json_representation, json_plus_xhtml)
             self.assertEqual(resource.request.response.getStatus(), 209)
 
     def test_acceptchanges_does_not_ignore_lp_html_for_bare_json_type(self):
         self.register_html_field_renderer()
-        json = None
+        json_representation = None
         with self.resource() as resource:
-            json = simplejson.loads(
+            json_representation = json.loads(
                 str(resource._representation(resource.JSON_PLUS_XHTML_TYPE))
             )
-            resource.applyChanges(json, resource.JSON_TYPE)
+            resource.applyChanges(json_representation, resource.JSON_TYPE)
             self.assertEqual(resource.request.response.getStatus(), 400)
 
 
@@ -1124,7 +1124,7 @@ class NotificationsProviderTest(EntryTestCase):
                 "X-Lazr-Notifications"
             )
             self.assertFalse(notifications is None)
-            notifications = simplejson.loads(notifications)
+            notifications = json.loads(notifications)
             expected_notifications = [
                 [logging.INFO, "Informational"],
                 [logging.WARNING, "Warning"],