diff options
author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-07-09 10:24:43 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-09 10:24:43 +0100 |
commit | 395fa8d1fd62517b00fa71004d7ebb60b6db4a17 (patch) | |
tree | 1bedc2ecb21ebf4e29ffeb8cb50e1452965c6ce6 /synapse/handlers/auth.py | |
parent | Add an isort configuration (#3463) (diff) | |
parent | changelog (diff) | |
download | synapse-395fa8d1fd62517b00fa71004d7ebb60b6db4a17.tar.xz |
Merge pull request #3464 from matrix-org/hawkowl/isort-run
Run isort on Synapse
Diffstat (limited to 'synapse/handlers/auth.py')
-rw-r--r-- | synapse/handlers/auth.py | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py index cbef1f2770..402e44cdef 100644 --- a/synapse/handlers/auth.py +++ b/synapse/handlers/auth.py @@ -14,14 +14,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -from twisted.internet import defer, threads +import logging +import attr +import bcrypt +import pymacaroons from canonicaljson import json -from ._base import BaseHandler +from twisted.internet import defer, threads +from twisted.web.client import PartialDownloadError + +import synapse.util.stringutils as stringutils from synapse.api.constants import LoginType from synapse.api.errors import ( - AuthError, Codes, InteractiveAuthIncompleteError, LoginError, StoreError, + AuthError, + Codes, + InteractiveAuthIncompleteError, + LoginError, + StoreError, SynapseError, ) from synapse.module_api import ModuleApi @@ -29,15 +39,7 @@ from synapse.types import UserID from synapse.util.caches.expiringcache import ExpiringCache from synapse.util.logcontext import make_deferred_yieldable -from twisted.web.client import PartialDownloadError - -import logging -import bcrypt -import pymacaroons -import attr - -import synapse.util.stringutils as stringutils - +from ._base import BaseHandler logger = logging.getLogger(__name__) |