Merge branch 'develop' into matrix-org-hotfixes

1 files changed, 2 insertions, 3 deletions

diff --git a/synapse/replication/tcp/streams.py b/synapse/replication/tcp/streams.py

index 07d99dd63c..ab65a6792e 100644
--- a/synapse/replication/tcp/streams.py
+++ b/synapse/replication/tcp/streams.py
@@ -24,11 +24,10 @@ Each stream is defined by the following information:
     update_function:    The function that returns a list of updates between two tokens
 """
 
-from twisted.internet import defer
-from collections import namedtuple
-
 import logging
+from collections import namedtuple
 
+from twisted.internet import defer
 
 logger = logging.getLogger(__name__)