Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Lets convert bytes to unicode instead

This commit is contained in:
Erik Johnston 2018-11-08 12:33:13 +00:00
parent 06c3d8050f
commit 5ebed18692
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/storage/end_to_end_keys.py
View File

@ -40,12 +40,10 @@ class EndToEndKeyStore(SQLBaseStore):
allow_none=True, allow_none=True,
) )
if old_key_json and not isinstance(old_key_json, bytes):
# In py3 we need old_key_json to match new_key_json type. The DB # In py3 we need old_key_json to match new_key_json type. The DB
# returns unicode while encode_canonical_json returns bytes # returns unicode while encode_canonical_json returns bytes.
old_key_json = old_key_json.encode("utf-8") new_key_json = encode_canonical_json(device_keys).decode("utf-8")
new_key_json = encode_canonical_json(device_keys)
if old_key_json == new_key_json: if old_key_json == new_key_json:
return False return False