diff options
author | Andrej Shadura <andrewsh@debian.org> | 2020-07-09 08:37:25 +0200 |
---|---|---|
committer | Andrej Shadura <andrewsh@debian.org> | 2020-07-09 08:37:25 +0200 |
commit | 5c1041a8f06afe64946fb5ca055a3f20b6378556 (patch) | |
tree | 233b8175c7059613cbd3ac020f87e56c9feedda9 /synapse/crypto/keyring.py | |
parent | 7da7769b791b28ac914f607ed6a08995bfe7cdef (diff) |
New upstream version 1.16.0
Diffstat (limited to 'synapse/crypto/keyring.py')
-rw-r--r-- | synapse/crypto/keyring.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py index a9f4025b..dbfc3e89 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py @@ -15,11 +15,9 @@ # limitations under the License. import logging +import urllib from collections import defaultdict -import six -from six.moves import urllib - import attr from signedjson.key import ( decode_verify_key_bytes, @@ -661,7 +659,7 @@ class PerspectivesKeyFetcher(BaseV2KeyFetcher): for response in query_response["server_keys"]: # do this first, so that we can give useful errors thereafter server_name = response.get("server_name") - if not isinstance(server_name, six.string_types): + if not isinstance(server_name, str): raise KeyLookupError( "Malformed response from key notary server %s: invalid server_name" % (perspective_name,) |