summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorPatrick Cloke <clokep@users.noreply.github.com>2020-07-15 13:40:54 -0400
committerGitHub <noreply@github.com>2020-07-15 13:40:54 -0400
commit35450519dee869e5641cff94ed35acd3bdaa8a42 (patch)
tree7b751cbd3ccb987885fa2665ca55d6be803747c5 /synapse/api
parentAvoid brand new rooms in `delete_old_current_state_events` (#7854) (diff)
downloadsynapse-35450519dee869e5641cff94ed35acd3bdaa8a42.tar.xz
Ensure that calls to `json.dumps` are compatible with the standard library json. (#7836)
Diffstat (limited to 'synapse/api')
-rw-r--r--synapse/api/errors.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/api/errors.py b/synapse/api/errors.py
index cc5edb5118..b3bab1aa52 100644
--- a/synapse/api/errors.py
+++ b/synapse/api/errors.py
@@ -15,12 +15,14 @@
 # limitations under the License.
 
 """Contains exceptions and error codes."""
-import json
+
 import logging
 import typing
 from http import HTTPStatus
 from typing import Dict, List, Optional, Union
 
+from canonicaljson import json
+
 from twisted.web import http
 
 if typing.TYPE_CHECKING: