diff --git a/changelog.d/9781.misc b/changelog.d/9781.misc
new file mode 100644
index 0000000000000000000000000000000000000000..d1c73fc7419a0d1b01bc6981a5535ce684fe6363
--- /dev/null
+++ b/changelog.d/9781.misc
@@ -0,0 +1 @@
+Update Black configuration to target Python 3.6.
diff --git a/pyproject.toml b/pyproject.toml
index cd880d4e39bfb52ab8d1ba4811fed7fc00130a49..8bca1fa4efd9028fa64c6896b7cb38ece33156e6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -35,7 +35,7 @@
showcontent = true
[tool.black]
-target-version = ['py35']
+target-version = ['py36']
exclude = '''
(
diff --git a/synapse/config/tls.py b/synapse/config/tls.py
index ad37b93c0252bb2063551b2c5bff187db5819175..85b5db4c40a844bb23393c4445972a7dd44363c6 100644
--- a/synapse/config/tls.py
+++ b/synapse/config/tls.py
@@ -270,7 +270,7 @@ class TlsConfig(Config):
tls_certificate_path,
tls_private_key_path,
acme_domain,
- **kwargs
+ **kwargs,
):
"""If the acme_domain is specified acme will be enabled.
If the TLS paths are not specified the default will be certs in the
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
index c817f2952d0b7b3f27c2981124c98b206eb5b5a0..0047907cd9ca7cb4f4927e7278ff628d377e7c6f 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -1071,7 +1071,7 @@ class PresenceEventSource:
room_ids=None,
include_offline=True,
explicit_room_id=None,
- **kwargs
+ **kwargs,
) -> Tuple[List[UserPresenceState], int]:
# The process for getting presence events are:
# 1. Get the rooms the user is in.
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py
index 5f01ebd3d4724365031bd0a2f62d87b5a0f368e4..ab47dec8f2f6722393db35aa3b347b363cc39921 100644
--- a/synapse/http/matrixfederationclient.py
+++ b/synapse/http/matrixfederationclient.py
@@ -272,7 +272,7 @@ class MatrixFederationHttpClient:
self,
request: MatrixFederationRequest,
try_trailing_slash_on_400: bool = False,
- **send_request_args
+ **send_request_args,
) -> IResponse:
"""Wrapper for _send_request which can optionally retry the request
upon receiving a combination of a 400 HTTP response code and a
diff --git a/synapse/http/site.py b/synapse/http/site.py
index c0c873ce3205fd7dc9872ad4992cd48beed6fb76..32b5e19c0926a65d170861fee504614189121cfe 100644
--- a/synapse/http/site.py
+++ b/synapse/http/site.py
@@ -497,7 +497,7 @@ class SynapseSite(Site):
resource,
server_version_string,
*args,
- **kwargs
+ **kwargs,
):
Site.__init__(self, resource, *args, **kwargs)
diff --git a/synapse/storage/database.py b/synapse/storage/database.py
index fa15b0ce5bc44d1dffa68d87d13b0708f9e6475b..77ef29ec71ebbde3f38b92ac13601b58748ab572 100644
--- a/synapse/storage/database.py
+++ b/synapse/storage/database.py
@@ -488,7 +488,7 @@ class DatabasePool:
exception_callbacks: List[_CallbackListEntry],
func: "Callable[..., R]",
*args: Any,
- **kwargs: Any
+ **kwargs: Any,
) -> R:
"""Start a new database transaction with the given connection.
@@ -622,7 +622,7 @@ class DatabasePool:
func: "Callable[..., R]",
*args: Any,
db_autocommit: bool = False,
- **kwargs: Any
+ **kwargs: Any,
) -> R:
"""Starts a transaction on the database and runs a given function
@@ -682,7 +682,7 @@ class DatabasePool:
func: "Callable[..., R]",
*args: Any,
db_autocommit: bool = False,
- **kwargs: Any
+ **kwargs: Any,
) -> R:
"""Wraps the .runWithConnection() method on the underlying db_pool.
@@ -775,7 +775,7 @@ class DatabasePool:
desc: str,
decoder: Optional[Callable[[Cursor], R]],
query: str,
- *args: Any
+ *args: Any,
) -> R:
"""Runs a single query for a result set.
diff --git a/tests/replication/slave/storage/test_events.py b/tests/replication/slave/storage/test_events.py
index 333374b183cdc360fc650f1dc542c0b3b48efcaa..db80a0bdbdaf34c8ad134bb39ce15285571404fa 100644
--- a/tests/replication/slave/storage/test_events.py
+++ b/tests/replication/slave/storage/test_events.py
@@ -340,7 +340,7 @@ class SlavedEventStoreTestCase(BaseSlavedStoreTestCase):
prev_state: Optional[list] = None,
redacts=None,
push_actions: Iterable = frozenset(),
- **content
+ **content,
):
prev_events = prev_events or []
auth_events = auth_events or []
diff --git a/tests/test_state.py b/tests/test_state.py
index 83383d88724c89a19c3d861485347685ca532455..0d626f49f6f1243635dd2a19e26ff18defe2feea 100644
--- a/tests/test_state.py
+++ b/tests/test_state.py
@@ -38,7 +38,7 @@ def create_event(
depth=2,
event_id=None,
prev_events: Optional[List[str]] = None,
- **kwargs
+ **kwargs,
):
global _next_event_id
diff --git a/tests/test_utils/event_injection.py b/tests/test_utils/event_injection.py
index c3c4a93e1f9b343eb18df283426322805a297b1e..3dfbf8f8a9e49dd465df4eab108f7770f674d4ec 100644
--- a/tests/test_utils/event_injection.py
+++ b/tests/test_utils/event_injection.py
@@ -33,7 +33,7 @@ async def inject_member_event(
membership: str,
target: Optional[str] = None,
extra_content: Optional[dict] = None,
- **kwargs
+ **kwargs,
) -> EventBase:
"""Inject a membership event into a room."""
if target is None:
@@ -58,7 +58,7 @@ async def inject_event(
hs: synapse.server.HomeServer,
room_version: Optional[str] = None,
prev_event_ids: Optional[List[str]] = None,
- **kwargs
+ **kwargs,
) -> EventBase:
"""Inject a generic event into a room
@@ -83,7 +83,7 @@ async def create_event(
hs: synapse.server.HomeServer,
room_version: Optional[str] = None,
prev_event_ids: Optional[List[str]] = None,
- **kwargs
+ **kwargs,
) -> Tuple[EventBase, EventContext]:
if room_version is None:
room_version = await hs.get_datastore().get_room_version_id(kwargs["room_id"])
diff --git a/tests/utils.py b/tests/utils.py
index 2e34fad11c85b02a4a1fb02f41e7a24ac9e599d3..c78d3e5ba706c85dde4bf82f9ff8848c44f61e37 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -190,7 +190,7 @@ def setup_test_homeserver(
config=None,
reactor=None,
homeserver_to_use: Type[HomeServer] = TestHomeServer,
- **kwargs
+ **kwargs,
):
"""
Setup a homeserver suitable for running tests against. Keyword arguments