From d44f303fe0800869992b446e141da2b97f445a0f Mon Sep 17 00:00:00 2001 From: Jorik Schellekens Date: Wed, 17 Jul 2019 13:58:12 +0100 Subject: [PATCH] Isort of ran out of puns for this one. --- synapse/federation/federation_server.py | 3 +-- synapse/handlers/device.py | 2 +- synapse/handlers/e2e_keys.py | 2 +- synapse/handlers/e2e_room_keys.py | 2 +- synapse/rest/client/v2_alpha/keys.py | 3 ++- synapse/rest/client/v2_alpha/room_keys.py | 2 +- synapse/rest/client/v2_alpha/sendtodevice.py | 2 +- synapse/storage/deviceinbox.py | 2 +- synapse/storage/devices.py | 2 +- synapse/storage/e2e_room_keys.py | 2 +- synapse/storage/end_to_end_keys.py | 3 +-- 11 files changed, 12 insertions(+), 13 deletions(-) diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index af7bbecc4f..fb7bcb23f3 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -25,6 +25,7 @@ from twisted.internet import defer from twisted.internet.abstract import isIPAddress from twisted.python import failure +import synapse.logging.opentracing as opentracing from synapse.api.constants import EventTypes, Membership from synapse.api.errors import ( AuthError, @@ -53,8 +54,6 @@ from synapse.util import glob_to_regex from synapse.util.async_helpers import Linearizer, concurrently_execute from synapse.util.caches.response_cache import ResponseCache -import synapse.logging.opentracing as opentracing - # when processing incoming transactions, we try to handle multiple rooms in # parallel, up to this limit. TRANSACTION_CONCURRENCY_LIMIT = 10 diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py index d1163c163a..cd5ab70d56 100644 --- a/synapse/handlers/device.py +++ b/synapse/handlers/device.py @@ -18,6 +18,7 @@ from six import iteritems, itervalues from twisted.internet import defer +import synapse.logging.opentracing as opentracing from synapse.api import errors from synapse.api.constants import EventTypes from synapse.api.errors import ( @@ -31,7 +32,6 @@ from synapse.util.async_helpers import Linearizer from synapse.util.caches.expiringcache import ExpiringCache from synapse.util.metrics import measure_func from synapse.util.retryutils import NotRetryingDestination -import synapse.logging.opentracing as opentracing from ._base import BaseHandler diff --git a/synapse/handlers/e2e_keys.py b/synapse/handlers/e2e_keys.py index a4b2f18e6b..08882ba3a9 100644 --- a/synapse/handlers/e2e_keys.py +++ b/synapse/handlers/e2e_keys.py @@ -15,7 +15,6 @@ # limitations under the License. import logging -import synapse.logging.opentracing as opentracing from six import iteritems @@ -23,6 +22,7 @@ from canonicaljson import encode_canonical_json, json from twisted.internet import defer +import synapse.logging.opentracing as opentracing from synapse.api.errors import CodeMessageException, SynapseError from synapse.logging.context import make_deferred_yieldable, run_in_background from synapse.types import UserID, get_domain_from_id diff --git a/synapse/handlers/e2e_room_keys.py b/synapse/handlers/e2e_room_keys.py index 1c34ff712f..2c7cf71b0e 100644 --- a/synapse/handlers/e2e_room_keys.py +++ b/synapse/handlers/e2e_room_keys.py @@ -19,6 +19,7 @@ from six import iteritems from twisted.internet import defer +import synapse.logging.opentracing as opentracing from synapse.api.errors import ( Codes, NotFoundError, @@ -27,7 +28,6 @@ from synapse.api.errors import ( SynapseError, ) from synapse.util.async_helpers import Linearizer -import synapse.logging.opentracing as opentracing logger = logging.getLogger(__name__) diff --git a/synapse/rest/client/v2_alpha/keys.py b/synapse/rest/client/v2_alpha/keys.py index 381c1e6da7..1f63f0c589 100644 --- a/synapse/rest/client/v2_alpha/keys.py +++ b/synapse/rest/client/v2_alpha/keys.py @@ -17,6 +17,7 @@ import logging from twisted.internet import defer +import synapse.logging.opentracing as opentracing from synapse.api.errors import SynapseError from synapse.http.servlet import ( RestServlet, @@ -25,7 +26,7 @@ from synapse.http.servlet import ( parse_string, ) from synapse.types import StreamToken -import synapse.logging.opentracing as opentracing + from ._base import client_patterns logger = logging.getLogger(__name__) diff --git a/synapse/rest/client/v2_alpha/room_keys.py b/synapse/rest/client/v2_alpha/room_keys.py index 51bd4f12ff..2d27e2c914 100644 --- a/synapse/rest/client/v2_alpha/room_keys.py +++ b/synapse/rest/client/v2_alpha/room_keys.py @@ -17,13 +17,13 @@ import logging from twisted.internet import defer +import synapse.logging.opentracing as opentracing from synapse.api.errors import Codes, NotFoundError, SynapseError from synapse.http.servlet import ( RestServlet, parse_json_object_from_request, parse_string, ) -import synapse.logging.opentracing as opentracing from ._base import client_patterns diff --git a/synapse/rest/client/v2_alpha/sendtodevice.py b/synapse/rest/client/v2_alpha/sendtodevice.py index 1385f80e27..8fa190fb13 100644 --- a/synapse/rest/client/v2_alpha/sendtodevice.py +++ b/synapse/rest/client/v2_alpha/sendtodevice.py @@ -17,10 +17,10 @@ import logging from twisted.internet import defer +import synapse.logging.opentracing as opentracing from synapse.http import servlet from synapse.http.servlet import parse_json_object_from_request from synapse.rest.client.transactions import HttpTransactionCache -import synapse.logging.opentracing as opentracing from ._base import client_patterns diff --git a/synapse/storage/deviceinbox.py b/synapse/storage/deviceinbox.py index 91c6cd4cf6..1df361bc51 100644 --- a/synapse/storage/deviceinbox.py +++ b/synapse/storage/deviceinbox.py @@ -19,10 +19,10 @@ from canonicaljson import json from twisted.internet import defer +import synapse.logging.opentracing as opentracing from synapse.storage._base import SQLBaseStore from synapse.storage.background_updates import BackgroundUpdateStore from synapse.util.caches.expiringcache import ExpiringCache -import synapse.logging.opentracing as opentracing logger = logging.getLogger(__name__) diff --git a/synapse/storage/devices.py b/synapse/storage/devices.py index f89cbad2ef..c81b3b8fc8 100644 --- a/synapse/storage/devices.py +++ b/synapse/storage/devices.py @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. import logging -import synapse.logging.opentracing as opentracing from six import iteritems @@ -21,6 +20,7 @@ from canonicaljson import json from twisted.internet import defer +import synapse.logging.opentracing as opentracing from synapse.api.errors import StoreError from synapse.metrics.background_process_metrics import run_as_background_process from synapse.storage._base import Cache, SQLBaseStore, db_to_json diff --git a/synapse/storage/e2e_room_keys.py b/synapse/storage/e2e_room_keys.py index bfd8b51362..8f77db127f 100644 --- a/synapse/storage/e2e_room_keys.py +++ b/synapse/storage/e2e_room_keys.py @@ -17,8 +17,8 @@ import json from twisted.internet import defer -from synapse.api.errors import StoreError import synapse.logging.opentracing as opentracing +from synapse.api.errors import StoreError from ._base import SQLBaseStore diff --git a/synapse/storage/end_to_end_keys.py b/synapse/storage/end_to_end_keys.py index ea5ed2737b..18a514f9ca 100644 --- a/synapse/storage/end_to_end_keys.py +++ b/synapse/storage/end_to_end_keys.py @@ -18,12 +18,11 @@ from canonicaljson import encode_canonical_json from twisted.internet import defer +import synapse.logging.opentracing as opentracing from synapse.util.caches.descriptors import cached from ._base import SQLBaseStore, db_to_json -import synapse.logging.opentracing as opentracing - class EndToEndKeyWorkerStore(SQLBaseStore): @opentracing.trace_defered_function