summary refs log tree commit diff
path: root/synapse/api/errors.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-04-03 14:39:57 +0100
committerGitHub <noreply@github.com>2018-04-03 14:39:57 +0100
commit0ca5c4d2af3d6c0249869801030d44fc860c1053 (patch)
treec85be32a5201155f56672379a43a5cf10bd53c8e /synapse/api/errors.py
parentMerge pull request #3043 from matrix-org/erikj/measure_state_group_creation (diff)
parentUse simplejson throughout (diff)
downloadsynapse-0ca5c4d2af3d6c0249869801030d44fc860c1053.tar.xz
Merge pull request #3048 from matrix-org/rav/use_simplejson
Use simplejson throughout
Diffstat (limited to 'synapse/api/errors.py')
-rw-r--r--synapse/api/errors.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/api/errors.py b/synapse/api/errors.py

index aa15f73f36..bee59e80dd 100644 --- a/synapse/api/errors.py +++ b/synapse/api/errors.py
@@ -15,9 +15,10 @@ """Contains exceptions and error codes.""" -import json import logging +import simplejson as json + logger = logging.getLogger(__name__)