diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-08-13 17:03:58 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-08-13 17:03:58 +0100 |
| commit | 3d1cdda762aa64ca84e096ff4c564130e9d2bf26 (patch) | |
| tree | e26bced4c123c8d2aa274d771728a9f2b2f5f1a1 | |
| parent | Don't time getDelayedCalls (diff) | |
| parent | Add max-line-length to the flake8 section of setup.cfg (diff) | |
| download | synapse-3d1cdda762aa64ca84e096ff4c564130e9d2bf26.tar.xz | |
Merge branch 'develop' into erikj/reactor_metrics
| -rw-r--r-- | setup.cfg | 3 | ||||
| -rw-r--r-- | synapse/http/matrixfederationclient.py | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/setup.cfg b/setup.cfg index 888ad6ed4a..abb649958e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -16,3 +16,6 @@ ignore = docs/* pylint.cfg tox.ini + +[flake8] +max-line-length = 90 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, |