diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2019-06-20 19:32:02 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-20 19:32:02 +1000 |
| commit | 32e7c9e7f20b57dd081023ac42d6931a8da9b3a3 (patch) | |
| tree | 139ef30c957535699d1ae0474e8b5ba2517196b2 /synapse/http/__init__.py | |
| parent | Merge pull request #5042 from matrix-org/erikj/fix_get_missing_events_error (diff) | |
| download | synapse-32e7c9e7f20b57dd081023ac42d6931a8da9b3a3.tar.xz | |
Run Black. (#5482)
Diffstat (limited to 'synapse/http/__init__.py')
| -rw-r--r-- | synapse/http/__init__.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/synapse/http/__init__.py b/synapse/http/__init__.py index d36bcd6336..3acf772cd1 100644 --- a/synapse/http/__init__.py +++ b/synapse/http/__init__.py @@ -25,6 +25,7 @@ from synapse.api.errors import SynapseError class RequestTimedOutError(SynapseError): """Exception representing timeout of an outbound request""" + def __init__(self): super(RequestTimedOutError, self).__init__(504, "Timed out") @@ -40,15 +41,12 @@ def cancelled_to_request_timed_out_error(value, timeout): return value -ACCESS_TOKEN_RE = re.compile(r'(\?.*access(_|%5[Ff])token=)[^&]*(.*)$') +ACCESS_TOKEN_RE = re.compile(r"(\?.*access(_|%5[Ff])token=)[^&]*(.*)$") def redact_uri(uri): """Strips access tokens from the uri replaces with <redacted>""" - return ACCESS_TOKEN_RE.sub( - r'\1<redacted>\3', - uri - ) + return ACCESS_TOKEN_RE.sub(r"\1<redacted>\3", uri) class QuieterFileBodyProducer(FileBodyProducer): @@ -57,6 +55,7 @@ class QuieterFileBodyProducer(FileBodyProducer): Workaround for https://github.com/matrix-org/synapse/issues/4003 / https://twistedmatrix.com/trac/ticket/6528 """ + def stopProducing(self): try: FileBodyProducer.stopProducing(self) |