diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-08-24 16:17:38 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-08-24 16:17:38 +0100 |
| commit | 78323ccdb359404109bfcdd8b5bf6f641ba3ff9b (patch) | |
| tree | 791e3840dff6bf74092a04c1886bf08546b9d31a /synapse/rest/client | |
| parent | Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-78323ccdb359404109bfcdd8b5bf6f641ba3ff9b.tar.xz | |
Remove syutil dependency in favour of smaller single-purpose libraries
Diffstat (limited to 'synapse/rest/client')
| -rw-r--r-- | synapse/rest/client/v1/voip.py | 2 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/keys.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/voip.py b/synapse/rest/client/v1/voip.py index 11d08fbced..45ed5cceac 100644 --- a/synapse/rest/client/v1/voip.py +++ b/synapse/rest/client/v1/voip.py @@ -40,7 +40,7 @@ class VoipRestServlet(ClientV1RestServlet): username = "%d:%s" % (expiry, auth_user.to_string()) mac = hmac.new(turnSecret, msg=username, digestmod=hashlib.sha1) - # We need to use standard base64 encoding here, *not* syutil's + # We need to use standard padded base64 encoding here # encode_base64 because we need to add the standard padding to get the # same result as the TURN server. password = base64.b64encode(mac.digest()) diff --git a/synapse/rest/client/v2_alpha/keys.py b/synapse/rest/client/v2_alpha/keys.py index 718928eedd..21654fa2da 100644 --- a/synapse/rest/client/v2_alpha/keys.py +++ b/synapse/rest/client/v2_alpha/keys.py @@ -18,7 +18,8 @@ from twisted.internet import defer from synapse.api.errors import SynapseError from synapse.http.servlet import RestServlet from synapse.types import UserID -from syutil.jsonutil import encode_canonical_json + +from canonicaljson import encode_canonical_json from ._base import client_v2_pattern |