From 706df0123c5e96b3829624de9b108de2fbc0ff6b Mon Sep 17 00:00:00 2001
From: Dan Callahan <dan.callahan@gmail.com>
Date: Fri, 23 Oct 2020 01:02:16 +0100
Subject: [PATCH] Tell Black to format code for Python 3.5

This allows trailing commas in multi-line arg lists.

Minor, but we might as well keep our formatting current with regard to
our minimum supported Python version.

Signed-off-by: Dan Callahan <danc@element.io>
---
 changelog.d/8664.misc                        | 1 +
 pyproject.toml                               | 2 +-
 synapse/http/client.py                       | 2 +-
 synapse/storage/database.py                  | 4 ++--
 synapse/util/retryutils.py                   | 2 +-
 tests/replication/_base.py                   | 2 +-
 tests/replication/tcp/streams/test_events.py | 2 +-
 tests/server.py                              | 4 ++--
 tests/storage/test_client_ips.py             | 2 +-
 tests/test_utils/event_injection.py          | 2 +-
 10 files changed, 12 insertions(+), 11 deletions(-)
 create mode 100644 changelog.d/8664.misc

diff --git a/changelog.d/8664.misc b/changelog.d/8664.misc
new file mode 100644
index 000000000000..278cf53adc46
--- /dev/null
+++ b/changelog.d/8664.misc
@@ -0,0 +1 @@
+Tell Black to format code for Python 3.5.
diff --git a/pyproject.toml b/pyproject.toml
index db4a2e41e439..cd880d4e39bf 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -35,7 +35,7 @@
         showcontent = true
 
 [tool.black]
-target-version = ['py34']
+target-version = ['py35']
 exclude = '''
 
 (
diff --git a/synapse/http/client.py b/synapse/http/client.py
index 8324632cb625..f409368802c5 100644
--- a/synapse/http/client.py
+++ b/synapse/http/client.py
@@ -359,7 +359,7 @@ async def request(
                     agent=self.agent,
                     data=body_producer,
                     headers=headers,
-                    **self._extra_treq_args
+                    **self._extra_treq_args,
                 )  # type: defer.Deferred
 
                 # we use our own timeout mechanism rather than treq's as a workaround
diff --git a/synapse/storage/database.py b/synapse/storage/database.py
index 0217e631085a..a0572b295239 100644
--- a/synapse/storage/database.py
+++ b/synapse/storage/database.py
@@ -94,7 +94,7 @@ def make_pool(
         cp_openfun=lambda conn: engine.on_new_connection(
             LoggingDatabaseConnection(conn, engine, "on_new_connection")
         ),
-        **db_config.config.get("args", {})
+        **db_config.config.get("args", {}),
     )
 
 
@@ -632,7 +632,7 @@ async def runInteraction(
                 func,
                 *args,
                 db_autocommit=db_autocommit,
-                **kwargs
+                **kwargs,
             )
 
             for after_callback, after_args, after_kwargs in after_callbacks:
diff --git a/synapse/util/retryutils.py b/synapse/util/retryutils.py
index a5cc9d055186..4ab379e42998 100644
--- a/synapse/util/retryutils.py
+++ b/synapse/util/retryutils.py
@@ -110,7 +110,7 @@ async def get_retry_limiter(destination, clock, store, ignore_backoff=False, **k
         failure_ts,
         retry_interval,
         backoff_on_failure=backoff_on_failure,
-        **kwargs
+        **kwargs,
     )
 
 
diff --git a/tests/replication/_base.py b/tests/replication/_base.py
index 093e2faac7bf..f1e53f33cd91 100644
--- a/tests/replication/_base.py
+++ b/tests/replication/_base.py
@@ -269,7 +269,7 @@ def make_worker_hs(
             homeserver_to_use=GenericWorkerServer,
             config=config,
             reactor=self.reactor,
-            **kwargs
+            **kwargs,
         )
 
         # If the instance is in the `instance_map` config then workers may try
diff --git a/tests/replication/tcp/streams/test_events.py b/tests/replication/tcp/streams/test_events.py
index c9998e88e6b7..bad0df08cf02 100644
--- a/tests/replication/tcp/streams/test_events.py
+++ b/tests/replication/tcp/streams/test_events.py
@@ -449,7 +449,7 @@ def _inject_test_event(
                 sender=sender,
                 type="test_event",
                 content={"body": body},
-                **kwargs
+                **kwargs,
             )
         )
 
diff --git a/tests/server.py b/tests/server.py
index 4d33b8409736..ea9c22bc51c6 100644
--- a/tests/server.py
+++ b/tests/server.py
@@ -380,7 +380,7 @@ def runWithConnection(func, *args, **kwargs):
                 pool._runWithConnection,
                 func,
                 *args,
-                **kwargs
+                **kwargs,
             )
 
         def runInteraction(interaction, *args, **kwargs):
@@ -390,7 +390,7 @@ def runInteraction(interaction, *args, **kwargs):
                 pool._runInteraction,
                 interaction,
                 *args,
-                **kwargs
+                **kwargs,
             )
 
         pool.runWithConnection = runWithConnection
diff --git a/tests/storage/test_client_ips.py b/tests/storage/test_client_ips.py
index 755c70db3142..e96ca1c8cab9 100644
--- a/tests/storage/test_client_ips.py
+++ b/tests/storage/test_client_ips.py
@@ -412,7 +412,7 @@ def _runtest(self, headers, expected_ip, make_request_args):
             "GET",
             "/_matrix/client/r0/admin/users/" + self.user_id,
             access_token=access_token,
-            **make_request_args
+            **make_request_args,
         )
         request.requestHeaders.addRawHeader(b"User-Agent", b"Mozzila pizza")
 
diff --git a/tests/test_utils/event_injection.py b/tests/test_utils/event_injection.py
index e93aa84405f5..c3c4a93e1f9b 100644
--- a/tests/test_utils/event_injection.py
+++ b/tests/test_utils/event_injection.py
@@ -50,7 +50,7 @@ async def inject_member_event(
         sender=sender,
         state_key=target,
         content=content,
-        **kwargs
+        **kwargs,
     )