diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-09-12 20:16:31 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-12 20:16:31 +1000 |
| commit | 8fd93b5eeaeddce16e0b510741dc5d4768cbc78d (patch) | |
| tree | 6147991007454bcf8a389f6ce199ad004ed9948e /synapse/crypto/keyring.py | |
| parent | Merge pull request #3845 from matrix-org/erikj/timeout_reads (diff) | |
| download | synapse-8fd93b5eeaeddce16e0b510741dc5d4768cbc78d.tar.xz | |
Port crypto/ to Python 3 (#3822)
Diffstat (limited to 'synapse/crypto/keyring.py')
| -rw-r--r-- | synapse/crypto/keyring.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py index 30e2742102..9d497abf17 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py @@ -16,9 +16,10 @@ import hashlib import logging -import urllib from collections import namedtuple +from six.moves import urllib + from signedjson.key import ( decode_verify_key_bytes, encode_verify_key_base64, @@ -432,7 +433,7 @@ class Keyring(object): # an incoming request. query_response = yield self.client.post_json( destination=perspective_name, - path=b"/_matrix/key/v2/query", + path="/_matrix/key/v2/query", data={ u"server_keys": { server_name: { @@ -513,8 +514,8 @@ class Keyring(object): (response, tls_certificate) = yield fetch_server_key( server_name, self.hs.tls_client_options_factory, - path=(b"/_matrix/key/v2/server/%s" % ( - urllib.quote(requested_key_id), + path=("/_matrix/key/v2/server/%s" % ( + urllib.parse.quote(requested_key_id), )).encode("ascii"), ) |