diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-05-15 19:26:54 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-05-15 19:37:41 +0100 |
| commit | e6027562e2a1964bcaa0163f1615ab72bfc6630b (patch) | |
| tree | edf4515f6d1c09da83dc84eba2e5893e2252b627 /scripts-dev/convert_server_keys.py | |
| parent | remove redundant `__func__` (diff) | |
| download | synapse-e6027562e2a1964bcaa0163f1615ab72bfc6630b.tar.xz | |
remove `builtins.buffer` code from storage code
this is no longer needed on python 3
Diffstat (limited to 'scripts-dev/convert_server_keys.py')
| -rw-r--r-- | scripts-dev/convert_server_keys.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/scripts-dev/convert_server_keys.py b/scripts-dev/convert_server_keys.py index 06b4c1e2ff..961dc59f11 100644 --- a/scripts-dev/convert_server_keys.py +++ b/scripts-dev/convert_server_keys.py @@ -3,8 +3,6 @@ import json import sys import time -import six - import psycopg2 import yaml from canonicaljson import encode_canonical_json @@ -12,10 +10,7 @@ from signedjson.key import read_signing_keys from signedjson.sign import sign_json from unpaddedbase64 import encode_base64 -if six.PY2: - db_type = six.moves.builtins.buffer -else: - db_type = memoryview +db_binary_type = memoryview def select_v1_keys(connection): @@ -72,7 +67,7 @@ def rows_v2(server, json): valid_until = json["valid_until_ts"] key_json = encode_canonical_json(json) for key_id in json["verify_keys"]: - yield (server, key_id, "-", valid_until, valid_until, db_type(key_json)) + yield (server, key_id, "-", valid_until, valid_until, db_binary_type(key_json)) def main(): |