diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-07-27 15:11:02 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-07-27 15:11:02 +0100 |
| commit | 29b25d59c6de7da759f152fbcaba0e323a75af71 (patch) | |
| tree | 508289fc88ee4b51b6c0bd5bd49538809f5a2bbf /synapse/storage | |
| parent | Clean up verify_json_objects_for_server (diff) | |
| parent | Merge pull request #955 from matrix-org/markjh/only_from2 (diff) | |
| download | synapse-29b25d59c6de7da759f152fbcaba0e323a75af71.tar.xz | |
Merge branch 'develop' into markjh/verify
Conflicts: synapse/crypto/keyring.py
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/transactions.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/transactions.py b/synapse/storage/transactions.py index 6c7481a728..6258ff1725 100644 --- a/synapse/storage/transactions.py +++ b/synapse/storage/transactions.py @@ -24,6 +24,7 @@ from collections import namedtuple import itertools import logging +import ujson as json logger = logging.getLogger(__name__) @@ -101,7 +102,7 @@ class TransactionStore(SQLBaseStore): ) if result and result["response_code"]: - return result["response_code"], result["response_json"] + return result["response_code"], json.loads(str(result["response_json"])) else: return None |