diff options
| author | Erik Johnston <erik@matrix.org> | 2018-05-25 10:53:43 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-05-25 10:53:43 +0100 |
| commit | bcc9e7f7775e7b605bc688eff70b91e4a5577d3a (patch) | |
| tree | b12587e6acc779b87df8352426194bfd4e1af66e /synapse/storage/keys.py | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/room_chunks (diff) | |
| parent | Merge pull request #3283 from NotAFile/py3-state (diff) | |
| download | synapse-bcc9e7f7775e7b605bc688eff70b91e4a5577d3a.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/room_chunks
Diffstat (limited to 'synapse/storage/keys.py')
| -rw-r--r-- | synapse/storage/keys.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/keys.py b/synapse/storage/keys.py index 87aeaf71d6..0540c2b0b1 100644 --- a/synapse/storage/keys.py +++ b/synapse/storage/keys.py @@ -92,7 +92,7 @@ class KeyStore(SQLBaseStore): if verify_key_bytes: defer.returnValue(decode_verify_key_bytes( - key_id, str(verify_key_bytes) + key_id, bytes(verify_key_bytes) )) @defer.inlineCallbacks |