diff options
author | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-31 12:32:07 -0400 |
---|---|---|
committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-31 12:32:07 -0400 |
commit | 9c94b48bf154fff1ac3550213ddb65b33fbb6ba8 (patch) | |
tree | e7ad5ba3aa90d3cb57906bf38d3c2cac352e95d3 /synapse/http/client.py | |
parent | clean up code a bit (diff) | |
parent | Update black to 19.10b0 (#6304) (diff) | |
download | synapse-9c94b48bf154fff1ac3550213ddb65b33fbb6ba8.tar.xz |
Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notify
Diffstat (limited to 'synapse/http/client.py')
-rw-r--r-- | synapse/http/client.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/http/client.py b/synapse/http/client.py index cdf828a4ff..2df5b383b5 100644 --- a/synapse/http/client.py +++ b/synapse/http/client.py @@ -535,7 +535,7 @@ class SimpleHttpClient(object): b"Content-Length" in resp_headers and int(resp_headers[b"Content-Length"][0]) > max_size ): - logger.warn("Requested URL is too large > %r bytes" % (self.max_size,)) + logger.warning("Requested URL is too large > %r bytes" % (self.max_size,)) raise SynapseError( 502, "Requested file is too large > %r bytes" % (self.max_size,), @@ -543,7 +543,7 @@ class SimpleHttpClient(object): ) if response.code > 299: - logger.warn("Got %d when downloading %s" % (response.code, url)) + logger.warning("Got %d when downloading %s" % (response.code, url)) raise SynapseError(502, "Got error %d" % (response.code,), Codes.UNKNOWN) # TODO: if our Content-Type is HTML or something, just read the first |