summary refs log tree commit diff
path: root/synapse/storage/schema
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-03-29 22:45:52 +0100
committerRichard van der Hoff <richard@matrix.org>2018-03-29 22:45:52 +0100
commitfcfe7f6ad3a2a9c285ac96008395fc47e096ff4b (patch)
treec85be32a5201155f56672379a43a5cf10bd53c8e /synapse/storage/schema
parentMerge pull request #3043 from matrix-org/erikj/measure_state_group_creation (diff)
downloadsynapse-fcfe7f6ad3a2a9c285ac96008395fc47e096ff4b.tar.xz
Use simplejson throughout
Let's use simplejson rather than json, for consistency.
Diffstat (limited to 'synapse/storage/schema')
-rw-r--r--synapse/storage/schema/delta/14/upgrade_appservice_db.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/schema/delta/14/upgrade_appservice_db.py b/synapse/storage/schema/delta/14/upgrade_appservice_db.py
index 8755bb2e49..4d725b92fe 100644
--- a/synapse/storage/schema/delta/14/upgrade_appservice_db.py
+++ b/synapse/storage/schema/delta/14/upgrade_appservice_db.py
@@ -12,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import json
 import logging
 
+import simplejson as json
+
 logger = logging.getLogger(__name__)