Merge branch 'develop' into matrix-org-hotfixes

1 files changed, 4 insertions, 5 deletions

diff --git a/synapse/storage/client_ips.py b/synapse/storage/client_ips.py

index 30d3541cf7..87c4e54931 100644
--- a/synapse/storage/client_ips.py
+++ b/synapse/storage/client_ips.py
@@ -15,15 +15,14 @@
 
 import logging
 
-from twisted.internet import defer
+from six import iteritems
 
-from ._base import Cache
-from . import background_updates
+from twisted.internet import defer
 
 from synapse.util.caches import CACHE_SIZE_FACTOR
 
-from six import iteritems
-
+from . import background_updates
+from ._base import Cache
 
 logger = logging.getLogger(__name__)