summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-08-03 17:57:15 -0700
committerAndrew Morgan <andrew@amorgan.xyz>2020-08-03 17:57:15 -0700
commit2ba03d740d9b9c302a3c54e6d119d6323311cbdf (patch)
tree1dc17b9cfe0556dd9b1f0118e6d11a9df88302bc
parentMerge commit '320ef9885' into anoa/dinsic_release_1_18_x (diff)
downloadsynapse-2ba03d740d9b9c302a3c54e6d119d6323311cbdf.tar.xz
dinsic lint
linting after the v1.18.0 mainline merge
-rw-r--r--synapse/handlers/identity.py2
-rw-r--r--synapse/handlers/profile.py2
-rw-r--r--synapse/rest/client/v2_alpha/account.py1
-rw-r--r--synapse/types.py3
4 files changed, 3 insertions, 5 deletions
diff --git a/synapse/handlers/identity.py b/synapse/handlers/identity.py

index 085f3fd11b..558ab24a8f 100644 --- a/synapse/handlers/identity.py +++ b/synapse/handlers/identity.py
@@ -69,7 +69,7 @@ class IdentityHandler(BaseHandler): self._enable_lookup = hs.config.enable_3pid_lookup async def threepid_from_creds( - self, id_server_url: str, creds: Dict[str, str] + self, id_server_url: str, creds: Dict[str, str] ) -> Optional[JsonDict]: """ Retrieve and validate a threepid identifier from a "credentials" dictionary against a diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py
index acecb9c5db..b05aa89455 100644 --- a/synapse/handlers/profile.py +++ b/synapse/handlers/profile.py
@@ -15,8 +15,8 @@ # limitations under the License. import logging - from typing import List + from signedjson.sign import sign_json from twisted.internet import defer, reactor diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py
index d4e0b962af..825ed5461e 100644 --- a/synapse/rest/client/v2_alpha/account.py +++ b/synapse/rest/client/v2_alpha/account.py
@@ -16,7 +16,6 @@ # limitations under the License. import logging import re - from http import HTTPStatus from twisted.internet import defer diff --git a/synapse/types.py b/synapse/types.py
index 40cab6ed74..7cc523e4f8 100644 --- a/synapse/types.py +++ b/synapse/types.py
@@ -19,10 +19,9 @@ import sys from collections import namedtuple from typing import Any, Dict, Tuple, TypeVar -from six.moves import filter - import attr from signedjson.key import decode_verify_key_bytes +from six.moves import filter from unpaddedbase64 import decode_base64 from synapse.api.errors import Codes, SynapseError