use py34 for now

pyproject.toml

@@ -30,7 +30,7 @@
         showcontent = true
 
 [tool.black]
-target-version = ['py35']
+target-version = ['py34']
 exclude = '''
 
 (

synapse/handlers/presence.py

@@ -999,7 +999,7 @@ def get_new_events(
         room_ids=None,
         include_offline=True,
         explicit_room_id=None,
-        **kwargs,
+        **kwargs
     ):
         # The process for getting presence events are:
         #  1. Get the rooms the user is in.

synapse/http/client.py

@@ -280,7 +280,7 @@ def request(self, method, uri, data=None, headers=None):
                 agent=self.agent,
                 data=body_producer,
                 headers=headers,
-                **self._extra_treq_args,
+                **self._extra_treq_args
             )
             request_deferred = timeout_deferred(
                 request_deferred,

synapse/http/site.py

@@ -357,7 +357,7 @@ def __init__(
         resource,
         server_version_string,
         *args,
-        **kwargs,
+        **kwargs
     ):
         Site.__init__(self, resource, *args, **kwargs)
 

synapse/storage/_base.py

@@ -490,7 +490,7 @@ def runInteraction(self, desc, func, *args, **kwargs):
                 exception_callbacks,
                 func,
                 *args,
-                **kwargs,
+                **kwargs
             )
 
             for after_callback, after_args, after_kwargs in after_callbacks:

synapse/util/retryutils.py

@@ -102,7 +102,7 @@ def get_retry_limiter(destination, clock, store, ignore_backoff=False, **kwargs)
             store,
             retry_interval,
             backoff_on_failure=backoff_on_failure,
-            **kwargs,
+            **kwargs
         )
     )
 

tests/replication/slave/storage/test_events.py

@@ -311,7 +311,7 @@ def build_event(
         prev_state=[],
         redacts=None,
         push_actions=[],
-        **content,
+        **content
     ):
 
         if depth is None:

tests/server.py

@@ -310,7 +310,7 @@ def runWithConnection(func, *args, **kwargs):
             pool._runWithConnection,
             func,
             *args,
-            **kwargs,
+            **kwargs
         )
 
     def runInteraction(interaction, *args, **kwargs):
@@ -320,7 +320,7 @@ def runInteraction(interaction, *args, **kwargs):
             pool._runInteraction,
             interaction,
             *args,
-            **kwargs,
+            **kwargs
         )
 
     if pool:

tests/storage/test_client_ips.py

@@ -248,7 +248,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")
 

tests/test_state.py

@@ -37,7 +37,7 @@ def create_event(
     depth=2,
     event_id=None,
     prev_events=[],
-    **kwargs,
+    **kwargs
 ):
     global _next_event_id
 

tests/utils.py

@@ -200,7 +200,7 @@ def setup_test_homeserver(
     config=None,
     reactor=None,
     homeserverToUse=TestHomeServer,
-    **kargs,
+    **kargs
 ):
     """
     Setup a homeserver suitable for running tests against.  Keyword arguments
@@ -281,7 +281,7 @@ def setup_test_homeserver(
             tls_server_context_factory=Mock(),
             tls_client_options_factory=Mock(),
             reactor=reactor,
-            **kargs,
+            **kargs
         )
 
         # Prepare the DB on SQLite -- PostgreSQL is a copy of an already up to
@@ -351,7 +351,7 @@ def cleanup():
             tls_server_context_factory=Mock(),
             tls_client_options_factory=Mock(),
             reactor=reactor,
-            **kargs,
+            **kargs
         )
 
     # bcrypt is far too slow to be doing in unit tests