summary refs log tree commit diff
path: root/synapse/federation/persistence.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-05 18:15:20 +0100
committerErik Johnston <erik@matrix.org>2015-05-05 18:15:20 +0100
commited2584050f4dc1e09f7e29735bbf89686e0fe04d (patch)
tree0f71510eb24eb9168b48a7b5e0a5ae946a06685d /synapse/federation/persistence.py
parentAdd a comment about the zip(*[zip(sorted(...),...)]) (diff)
parentUse buffer(...) when inserting into bytea column (diff)
downloadsynapse-ed2584050f4dc1e09f7e29735bbf89686e0fe04d.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/executemany
Diffstat (limited to 'synapse/federation/persistence.py')
-rw-r--r--synapse/federation/persistence.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/federation/persistence.py b/synapse/federation/persistence.py

index 76a9dcd777..865766eb2c 100644 --- a/synapse/federation/persistence.py +++ b/synapse/federation/persistence.py
@@ -23,8 +23,6 @@ from twisted.internet import defer from synapse.util.logutils import log_function -from syutil.jsonutil import encode_canonical_json - import logging @@ -71,7 +69,7 @@ class TransactionActions(object): transaction.transaction_id, transaction.origin, code, - encode_canonical_json(response) + response, ) @defer.inlineCallbacks