diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-07-20 11:29:18 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-07-20 11:29:18 +0100 |
| commit | 4ff8486f0fcd1783ea07a4af2fc51ca1e1413952 (patch) | |
| tree | d05050e873c35fcb5d8ec8ee06c30dfcf38b481a /synapse/rest/client | |
| parent | Merge remote-tracking branch 'origin/master' into dinsic (diff) | |
| download | synapse-4ff8486f0fcd1783ea07a4af2fc51ca1e1413952.tar.xz | |
fix missing import and run isort dinsic_2018-07-20
Diffstat (limited to 'synapse/rest/client')
| -rw-r--r-- | synapse/rest/client/v2_alpha/register.py | 3 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/user_directory.py | 3 |
2 files changed, 4 insertions, 2 deletions
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 |