summary refs log tree commit diff
path: root/synapse/storage/transactions.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-08-25 10:52:16 +0100
committerMark Haines <mjark@negativecurvature.net>2015-08-25 10:52:16 +0100
commit1c847af28a745434f0707188bc364d90eca5db81 (patch)
tree23b5b0a59283552b9f07e3b240d68fb221a2c965 /synapse/storage/transactions.py
parentMerge pull request #244 from matrix-org/markjh/refresh_tokens (diff)
parentFix typo in module imports and package dependencies (diff)
downloadsynapse-1c847af28a745434f0707188bc364d90eca5db81.tar.xz
Merge pull request #243 from matrix-org/markjh/remove_syutil
Replace syutil dependency with smaller, single-purpose libraries
Diffstat (limited to 'synapse/storage/transactions.py')
-rw-r--r--synapse/storage/transactions.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/transactions.py b/synapse/storage/transactions.py
index c8c7e6591a..15695e9831 100644
--- a/synapse/storage/transactions.py
+++ b/synapse/storage/transactions.py
@@ -18,7 +18,7 @@ from synapse.util.caches.descriptors import cached
 
 from collections import namedtuple
 
-from syutil.jsonutil import encode_canonical_json
+from canonicaljson import encode_canonical_json
 import logging
 
 logger = logging.getLogger(__name__)