diff options
| author | Erik Johnston <erik@matrix.org> | 2015-08-13 11:47:38 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-08-13 11:47:38 +0100 |
| commit | adbd720fab5f6ee42c4e14b06eb6f385bae14dc6 (patch) | |
| tree | aaed40151b4a91fcf14e99eb706fd514a436caed /synapse | |
| parent | Merge pull request #173 from matrix-org/markjh/twisted-15 (diff) | |
| download | synapse-adbd720fab5f6ee42c4e14b06eb6f385bae14dc6.tar.xz | |
PEP8
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/http/matrixfederationclient.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py index 4d74bd5d78..854e17a473 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py @@ -142,7 +142,6 @@ class MatrixFederationHttpClient(object): producer ) - return self.clock.time_bound_deferred( request_deferred, time_out=timeout/1000. if timeout else 60, |