summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorWill Hunt <will@half-shot.uk>2020-07-05 16:32:02 +0100
committerGitHub <noreply@github.com>2020-07-05 16:32:02 +0100
commit62b1ce85398f52e7d6137e77083294d0c90af459 (patch)
tree8bb59226c2abea66fccfd42068a608a88eeaae8c /synapse/api
parentMerge different Resource implementation classes (#7732) (diff)
downloadsynapse-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/api')
-rw-r--r--synapse/api/auth.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py

index 06ba6604f3..cb22508f4d 100644 --- a/synapse/api/auth.py +++ b/synapse/api/auth.py
@@ -12,7 +12,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 from typing import Optional @@ -22,7 +21,6 @@ from netaddr import IPAddress from twisted.internet import defer from twisted.web.server import Request -import synapse.logging.opentracing as opentracing import synapse.types from synapse import event_auth from synapse.api.auth_blocking import AuthBlocking @@ -35,6 +33,7 @@ from synapse.api.errors import ( ) from synapse.api.room_versions import KNOWN_ROOM_VERSIONS from synapse.events import EventBase +from synapse.logging import opentracing as opentracing from synapse.types import StateMap, UserID from synapse.util.caches import register_cache from synapse.util.caches.lrucache import LruCache