summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-03-15 12:00:23 +0000
committerErik Johnston <erik@matrix.org>2019-03-15 14:39:25 +0000
commit7a9aa4b81bf84cd1f0b61823ae69e9a91cd2fa98 (patch)
treeeccfd4ce5f0ce1483daff312769156d163ea169c
parentFixups (diff)
downloadsynapse-7a9aa4b81bf84cd1f0b61823ae69e9a91cd2fa98.tar.xz
Isort
-rw-r--r--synapse/handlers/profile.py4
-rw-r--r--synapse/rest/client/v2_alpha/account.py2
-rw-r--r--tests/rulecheck/test_domainrulecheck.py4
3 files changed, 5 insertions, 5 deletions
diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py
index 2313379c58..7b8c77ba4d 100644
--- a/synapse/handlers/profile.py
+++ b/synapse/handlers/profile.py
@@ -16,12 +16,12 @@
 
 import logging
 
+from six.moves import range
+
 from signedjson.sign import sign_json
 
 from twisted.internet import defer, reactor
 
-from six.moves import range
-
 from synapse.api.errors import (
     AuthError,
     CodeMessageException,
diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py
index e1745fad2d..53f47e9da7 100644
--- a/synapse/rest/client/v2_alpha/account.py
+++ b/synapse/rest/client/v2_alpha/account.py
@@ -27,9 +27,9 @@ from synapse.http.servlet import (
     assert_params_in_dict,
     parse_json_object_from_request,
 )
+from synapse.types import UserID
 from synapse.util.msisdn import phone_number_to_msisdn
 from synapse.util.threepids import check_3pid_allowed
-from synapse.types import UserID
 
 from ._base import client_v2_patterns, interactive_auth_handler
 
diff --git a/tests/rulecheck/test_domainrulecheck.py b/tests/rulecheck/test_domainrulecheck.py
index a24fb53766..702862f78b 100644
--- a/tests/rulecheck/test_domainrulecheck.py
+++ b/tests/rulecheck/test_domainrulecheck.py
@@ -14,11 +14,11 @@
 # limitations under the License.
 
 
-from tests import unittest
-
 from synapse.config._base import ConfigError
 from synapse.rulecheck.domain_rule_checker import DomainRuleChecker
 
+from tests import unittest
+
 
 class DomainRuleCheckerTestCase(unittest.TestCase):