summary refs log tree commit diff
path: root/synapse/http
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-03-13 19:04:43 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-03-13 19:04:43 +0000
commitc2d848b80d8b83646b1a0413057efad910a3df12 (patch)
tree9b68d082d76f69ee593159ff8606b5f6b3d1ec06 /synapse/http
parentAre you happy now (diff)
downloadsynapse-c2d848b80d8b83646b1a0413057efad910a3df12.tar.xz
Destructure again
Diffstat (limited to 'synapse/http')
-rw-r--r--synapse/http/matrixfederationclient.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py
index f554d5e21c..380bf294e5 100644
--- a/synapse/http/matrixfederationclient.py
+++ b/synapse/http/matrixfederationclient.py
@@ -190,11 +190,12 @@ class MatrixFederationHttpClient(object):
 
     @defer.inlineCallbacks
     def _send_request_with_optional_trailing_slash(
-            self,
-            request,
-            try_trailing_slash_on_400=False,
-            backoff_on_404=False,
-            **kwargs):
+        self,
+        request,
+        try_trailing_slash_on_400=False,
+        backoff_on_404=False,
+        **kwargs,
+    ):
         """Wrapper for _send_request which can optionally retry the request
         upon receiving a combination of a 400 HTTP response code and a
         'M_UNRECOGNIZED' errcode. This is a workaround for Synapse <=v0.99.2
@@ -585,7 +586,7 @@ class MatrixFederationHttpClient(object):
         }
 
         response = yield self._send_request_with_optional_trailing_slash(
-            request, try_trailing_slash_on_400, backoff_on_404, send_request_args,
+            request, try_trailing_slash_on_400, backoff_on_404, **send_request_args,
         )
 
         body = yield _handle_json_response(
@@ -705,7 +706,7 @@ class MatrixFederationHttpClient(object):
         }
 
         response = yield self._send_request_with_optional_trailing_slash(
-            request, try_trailing_slash_on_400, False, send_request_args,
+            request, try_trailing_slash_on_400, False, **send_request_args,
         )
 
         body = yield _handle_json_response(