kaslo/synapse
1
0
Fork 0
Code Wiki Activity

remove builtins.buffer code from storage code

Browse Source 
this is no longer needed on python 3
This commit is contained in:
Richard van der Hoff
2020-05-15 19:26:54 +01:00
parent 91f51c611c
commit e6027562e2
4 changed files with 5 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scripts-dev/convert_server_keys.py
View File

@@ -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():