diff options
| author | Will Hunt <will@half-shot.uk> | 2020-07-05 16:32:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-05 16:32:02 +0100 |
| commit | 62b1ce85398f52e7d6137e77083294d0c90af459 (patch) | |
| tree | 8bb59226c2abea66fccfd42068a608a88eeaae8c /synapse/handlers/auth.py | |
| parent | Merge different Resource implementation classes (#7732) (diff) | |
| download | synapse-62b1ce85398f52e7d6137e77083294d0c90af459.tar.xz | |
isort 5 compatibility (#7786)
The CI appears to use the latest version of isort, which is a problem when isort gets a major version bump. Rather than try to pin the version, I've done the necessary to make isort5 happy with synapse.
Diffstat (limited to 'synapse/handlers/auth.py')
| -rw-r--r-- | synapse/handlers/auth.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py index d713a06bf9..a162392e4c 100644 --- a/synapse/handlers/auth.py +++ b/synapse/handlers/auth.py @@ -13,7 +13,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - import logging import time import unicodedata @@ -24,7 +23,6 @@ import attr import bcrypt # type: ignore[import] import pymacaroons -import synapse.util.stringutils as stringutils from synapse.api.constants import LoginType from synapse.api.errors import ( AuthError, @@ -45,6 +43,7 @@ from synapse.metrics.background_process_metrics import run_as_background_process from synapse.module_api import ModuleApi from synapse.push.mailer import load_jinja2_templates from synapse.types import Requester, UserID +from synapse.util import stringutils as stringutils from synapse.util.threepids import canonicalise_email from ._base import BaseHandler |