summary refs log tree commit diff
path: root/synapse/http/matrixfederationclient.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2016-02-02 17:18:54 +0000
committerDaniel Wagner-Hall <dawagner@gmail.com>2016-02-02 17:18:54 +0000
commitde11b5b9b5da286d2cb96f8ae5c18f6b55b9b460 (patch)
tree009a6132dd0c507fb68a449efc247519d2a8aab7 /synapse/http/matrixfederationclient.py
parentMerge pull request #549 from matrix-org/erikj/sync (diff)
parentFix flake8 warnings for new flake8 (diff)
downloadsynapse-de11b5b9b5da286d2cb96f8ae5c18f6b55b9b460.tar.xz
Merge pull request #551 from matrix-org/daniel/flake8
Fix flake8 warnings for new flake8
Diffstat (limited to 'synapse/http/matrixfederationclient.py')
-rw-r--r--synapse/http/matrixfederationclient.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py
index da13e32e78..c3589534f8 100644
--- a/synapse/http/matrixfederationclient.py
+++ b/synapse/http/matrixfederationclient.py
@@ -152,7 +152,7 @@ class MatrixFederationHttpClient(object):
 
                         return self.clock.time_bound_deferred(
                             request_deferred,
-                            time_out=timeout/1000. if timeout else 60,
+                            time_out=timeout / 1000. if timeout else 60,
                         )
 
                     response = yield preserve_context_over_fn(