diff options
| author | Erik Johnston <erik@matrix.org> | 2018-11-08 12:33:13 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-02-13 14:24:42 +0000 |
| commit | b8077ca8cd34d5b21846cb8167ed080865b0268a (patch) | |
| tree | 7929c00ca128b4f83d5f5ddd405e3593da4e0ce5 | |
| parent | Newsfile (diff) | |
| download | synapse-b8077ca8cd34d5b21846cb8167ed080865b0268a.tar.xz | |
Lets convert bytes to unicode instead
| -rw-r--r-- | synapse/storage/end_to_end_keys.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/synapse/storage/end_to_end_keys.py b/synapse/storage/end_to_end_keys.py index 29281630c0..2a0f6cfca9 100644 --- a/synapse/storage/end_to_end_keys.py +++ b/synapse/storage/end_to_end_keys.py @@ -40,12 +40,10 @@ class EndToEndKeyStore(SQLBaseStore): 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 - # returns unicode while encode_canonical_json returns bytes - old_key_json = old_key_json.encode("utf-8") + # In py3 we need old_key_json to match new_key_json type. The DB + # returns unicode while encode_canonical_json returns bytes. + 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: return False |