From f093873d697f99a59cade944bb68850b017afd09 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Mon, 24 Aug 2015 16:30:35 +0100
Subject: [PATCH] Replace syutil references in scripts

---
 scripts-dev/check_event_hash.py    |  2 +-
 scripts-dev/check_signature.py     |  8 +++-----
 scripts-dev/convert_server_keys.py |  8 ++++----
 scripts-dev/hash_history.py        |  4 ++--
 scripts/upgrade_db_to_v0.6.0.py    | 15 +++++----------
 5 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/scripts-dev/check_event_hash.py b/scripts-dev/check_event_hash.py
index 679afbd26..7ccae34d4 100644
--- a/scripts-dev/check_event_hash.py
+++ b/scripts-dev/check_event_hash.py
@@ -1,5 +1,5 @@
 from synapse.crypto.event_signing import *
-from syutil.base64util import encode_base64
+from unpaddedbase64 import encode_base64
 
 import argparse
 import hashlib
diff --git a/scripts-dev/check_signature.py b/scripts-dev/check_signature.py
index 59e3d603a..079577908 100644
--- a/scripts-dev/check_signature.py
+++ b/scripts-dev/check_signature.py
@@ -1,9 +1,7 @@
 
-from syutil.crypto.jsonsign import verify_signed_json
-from syutil.crypto.signing_key import (
-    decode_verify_key_bytes, write_signing_keys
-)
-from syutil.base64util import decode_base64
+from signedjson.sign import verify_signed_json
+from signedjson.key import decode_verify_key_bytes, write_signing_keys
+from unpaddedbase64 import decode_base64
 
 import urllib2
 import json
diff --git a/scripts-dev/convert_server_keys.py b/scripts-dev/convert_server_keys.py
index a1ee39059..151551f22 100644
--- a/scripts-dev/convert_server_keys.py
+++ b/scripts-dev/convert_server_keys.py
@@ -4,10 +4,10 @@ import sys
 import json
 import time
 import hashlib
-from syutil.base64util import encode_base64
-from syutil.crypto.signing_key import read_signing_keys
-from syutil.crypto.jsonsign import sign_json
-from syutil.jsonutil import encode_canonical_json
+from unpaddedbase64 import encode_base64
+from signedjson.key import read_signing_keys
+from signedjson.sign import sign_json
+from canonicaljson import encode_canonical_json
 
 
 def select_v1_keys(connection):
diff --git a/scripts-dev/hash_history.py b/scripts-dev/hash_history.py
index bdad530af..616d6a10e 100644
--- a/scripts-dev/hash_history.py
+++ b/scripts-dev/hash_history.py
@@ -6,8 +6,8 @@ from synapse.crypto.event_signing import (
     add_event_pdu_content_hash, compute_pdu_event_reference_hash
 )
 from synapse.api.events.utils import prune_pdu
-from syutil.base64util import encode_base64, decode_base64
-from syutil.jsonutil import encode_canonical_json
+from unpaddedbase64 import encode_base64, decode_base64
+from canonicaljson import encode_canonical_json
 import sqlite3
 import sys
 
diff --git a/scripts/upgrade_db_to_v0.6.0.py b/scripts/upgrade_db_to_v0.6.0.py
index f466ca510..cd4be28b8 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])