diff --git a/synapse/config/consent_config.py b/synapse/config/consent_config.py
index cec978125b..e22c731aad 100644
--- a/synapse/config/consent_config.py
+++ b/synapse/config/consent_config.py
@@ -15,7 +15,6 @@
from ._base import Config
-
DEFAULT_CONFIG = """\
# User Consent configuration
#
diff --git a/synapse/config/logger.py b/synapse/config/logger.py
index cc1051057c..a87b11a1df 100644
--- a/synapse/config/logger.py
+++ b/synapse/config/logger.py
@@ -29,7 +29,6 @@ from synapse.util.versionstring import get_version_string
from ._base import Config
-
DEFAULT_LOG_CONFIG = Template("""
version: 1
diff --git a/synapse/config/server_notices_config.py b/synapse/config/server_notices_config.py
index 91b08446b7..3c39850ac6 100644
--- a/synapse/config/server_notices_config.py
+++ b/synapse/config/server_notices_config.py
@@ -16,7 +16,6 @@ from synapse.types import UserID
from ._base import Config
-
DEFAULT_CONFIG = """\
# Server Notices room configuration
#
diff --git a/synapse/http/client.py b/synapse/http/client.py
index 0622a69e86..d6a0d75b2b 100644
--- a/synapse/http/client.py
+++ b/synapse/http/client.py
@@ -26,11 +26,9 @@ from OpenSSL.SSL import VERIFY_NONE
from twisted.internet import defer, protocol, reactor, ssl, task
from twisted.internet.endpoints import HostnameEndpoint, wrapClientTLS
from twisted.web._newclient import ResponseDone
+from twisted.web.client import Agent, BrowserLikeRedirectAgent, ContentDecoderAgent
from twisted.web.client import FileBodyProducer as TwistedFileBodyProducer
from twisted.web.client import (
- Agent,
- BrowserLikeRedirectAgent,
- ContentDecoderAgent,
GzipDecoder,
HTTPConnectionPool,
PartialDownloadError,
diff --git a/synapse/rest/__init__.py b/synapse/rest/__init__.py
index 0d69d37f7e..75c2a4ec8e 100644
--- a/synapse/rest/__init__.py
+++ b/synapse/rest/__init__.py
@@ -15,21 +15,11 @@
from synapse.http.server import JsonResource
from synapse.rest.client import versions
+from synapse.rest.client.v1 import admin, directory, events, initial_sync
from synapse.rest.client.v1 import login as v1_login
+from synapse.rest.client.v1 import logout, presence, profile, push_rule, pusher
from synapse.rest.client.v1 import register as v1_register
-from synapse.rest.client.v1 import (
- admin,
- directory,
- events,
- initial_sync,
- logout,
- presence,
- profile,
- push_rule,
- pusher,
- room,
- voip,
-)
+from synapse.rest.client.v1 import room, voip
from synapse.rest.client.v2_alpha import (
account,
account_data,
diff --git a/synapse/storage/schema/delta/48/group_unique_indexes.py b/synapse/storage/schema/delta/48/group_unique_indexes.py
index ac4ac66cd4..2233af87d7 100644
--- a/synapse/storage/schema/delta/48/group_unique_indexes.py
+++ b/synapse/storage/schema/delta/48/group_unique_indexes.py
@@ -15,7 +15,6 @@
from synapse.storage.engines import PostgresEngine
from synapse.storage.prepare_database import get_statements
-
FIX_INDEXES = """
-- rebuild indexes as uniques
DROP INDEX groups_invites_g_idx;
|
