isort

synapse/handlers/device.py

@@ -18,6 +18,7 @@
 
 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.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
 

synapse/handlers/devicemessage.py

@@ -28,7 +28,6 @@
 )
 from synapse.types import UserID, get_domain_from_id
 from synapse.util.stringutils import random_string
-import synapse.logging.opentracing as opentracing
 
 logger = logging.getLogger(__name__)
 

synapse/rest/client/v2_alpha/sendtodevice.py

@@ -17,10 +17,10 @@
 
 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
 

synapse/storage/deviceinbox.py

@@ -19,10 +19,10 @@
 
 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__)
 

synapse/storage/devices.py

@@ -13,14 +13,14 @@
 # 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
 
 from canonicaljson import json
 
 from twisted.internet import defer
 
+import synapse.logging.opentracing as opentracing
 from synapse.api.errors import StoreError
 from synapse.logging.opentracing import (
     get_active_span_text_map,