summary refs log tree commit diff
path: root/scripts
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-08-25 10:52:16 +0100
committerMark Haines <mjark@negativecurvature.net>2015-08-25 10:52:16 +0100
commit1c847af28a745434f0707188bc364d90eca5db81 (patch)
tree23b5b0a59283552b9f07e3b240d68fb221a2c965 /scripts
parentMerge pull request #244 from matrix-org/markjh/refresh_tokens (diff)
parentFix typo in module imports and package dependencies (diff)
downloadsynapse-1c847af28a745434f0707188bc364d90eca5db81.tar.xz
Merge pull request #243 from matrix-org/markjh/remove_syutil
Replace syutil dependency with smaller, single-purpose libraries
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/upgrade_db_to_v0.6.0.py15
1 files changed, 5 insertions, 10 deletions
diff --git a/scripts/upgrade_db_to_v0.6.0.py b/scripts/upgrade_db_to_v0.6.0.py
index f466ca510e..cd4be28b86 100755
--- a/scripts/upgrade_db_to_v0.6.0.py
+++ b/scripts/upgrade_db_to_v0.6.0.py
@@ -4,7 +4,7 @@ from synapse.storage._base import SQLBaseStore
 from synapse.storage.signatures import SignatureStore
 from synapse.storage.event_federation import EventFederationStore
 
-from syutil.base64util import encode_base64, decode_base64
+from unpaddedbase64 import encode_base64, decode_base64
 
 from synapse.crypto.event_signing import compute_event_signature
 
@@ -13,12 +13,10 @@ from synapse.events.utils import prune_event
 
 from synapse.crypto.event_signing import check_event_content_hash
 
-from syutil.crypto.jsonsign import (
-    verify_signed_json, SignatureVerifyException,
-)
-from syutil.crypto.signing_key import decode_verify_key_bytes
+from signedjson.sign import verify_signed_json, SignatureVerifyException
+from signedjson.key import decode_verify_key_bytes
 
-from syutil.jsonutil import encode_canonical_json
+from canonicaljson import encode_canonical_json
 
 import argparse
 # import dns.resolver
@@ -26,7 +24,6 @@ import hashlib
 import httplib
 import json
 import sqlite3
-import syutil
 import urllib2
 
 
@@ -324,8 +321,6 @@ if __name__ == "__main__":
     )
     args = parser.parse_args()
 
-    signing_key = syutil.crypto.signing_key.read_signing_keys(
-        args.signing_key
-    )
+    signing_key = signedjson.key.read_signing_keys(args.signing_key)
 
     main(args.database, args.server_name, signing_key[0])