summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--synapse/handlers/profile.py6
-rw-r--r--synapse/rest/client/v2_alpha/register.py3
-rw-r--r--synapse/rest/client/v2_alpha/user_directory.py3
3 files changed, 7 insertions, 5 deletions
diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py

index ba24c5e60c..3987af85d8 100644 --- a/synapse/handlers/profile.py +++ b/synapse/handlers/profile.py
@@ -16,16 +16,16 @@ import logging +from signedjson.sign import sign_json + from twisted.internet import defer, reactor from synapse.api.errors import AuthError, CodeMessageException, SynapseError -from synapse.util.logcontext import run_in_background from synapse.types import UserID, get_domain_from_id +from synapse.util.logcontext import run_in_background from ._base import BaseHandler -from signedjson.sign import sign_json - logger = logging.getLogger(__name__) diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py
index 7aaa98fc8f..8b21345316 100644 --- a/synapse/rest/client/v2_alpha/register.py +++ b/synapse/rest/client/v2_alpha/register.py
@@ -15,9 +15,10 @@ # limitations under the License. import hmac -import re import logging +import re from hashlib import sha1 +from string import capwords from six import string_types diff --git a/synapse/rest/client/v2_alpha/user_directory.py b/synapse/rest/client/v2_alpha/user_directory.py
index 7d895cee1e..5db8b5efb3 100644 --- a/synapse/rest/client/v2_alpha/user_directory.py +++ b/synapse/rest/client/v2_alpha/user_directory.py
@@ -15,9 +15,10 @@ import logging -from twisted.internet import defer from signedjson.sign import sign_json +from twisted.internet import defer + from synapse.api.errors import SynapseError from synapse.http.servlet import RestServlet, parse_json_object_from_request