diff options
| author | David Baker <dave@matrix.org> | 2015-05-07 09:33:42 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-05-07 09:33:42 +0100 |
| commit | 97a64f3ebeaac9d9e97699f41751e272fc0c1c73 (patch) | |
| tree | 30369edfc0af5da6f41f32932936ec363e844787 /synapse/federation/persistence.py | |
| parent | Typo (diff) | |
| parent | Optional profiling using cProfile (diff) | |
| download | synapse-97a64f3ebeaac9d9e97699f41751e272fc0c1c73.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/federation/persistence.py')
| -rw-r--r-- | synapse/federation/persistence.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/synapse/federation/persistence.py b/synapse/federation/persistence.py index 76a9dcd777..1a7cc02f92 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 @@ -101,5 +99,5 @@ class TransactionActions(object): transaction.transaction_id, transaction.destination, response_code, - encode_canonical_json(response_dict) + response_dict, ) |