diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2015-08-25 10:52:16 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2015-08-25 10:52:16 +0100 |
| commit | 1c847af28a745434f0707188bc364d90eca5db81 (patch) | |
| tree | 23b5b0a59283552b9f07e3b240d68fb221a2c965 /synapse/rest/client | |
| parent | Merge pull request #244 from matrix-org/markjh/refresh_tokens (diff) | |
| parent | Fix typo in module imports and package dependencies (diff) | |
| download | synapse-1c847af28a745434f0707188bc364d90eca5db81.tar.xz | |
Merge pull request #243 from matrix-org/markjh/remove_syutil
Replace syutil dependency with 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 |