diff options
| author | Adrian Tschira <nota@notafile.com> | 2018-04-15 17:20:37 +0200 |
|---|---|---|
| committer | Adrian Tschira <nota@notafile.com> | 2018-04-15 20:32:42 +0200 |
| commit | 1515560f5ce8054a539dd0fed9e88232883f079f (patch) | |
| tree | 31df1feed0768aa41f0da3ea0f23ea107ce1dda5 /synapse/crypto/keyring.py | |
| parent | Merge branch 'master' of https://github.com/matrix-org/synapse into develop (diff) | |
| download | synapse-1515560f5ce8054a539dd0fed9e88232883f079f.tar.xz | |
Use str(e) instead of e.message
Doing this I learned e.message was pretty shortlived, added in 2.6, they realized it was a bad idea and deprecated it in 2.7 Signed-off-by: Adrian Tschira <nota@notafile.com>
Diffstat (limited to 'synapse/crypto/keyring.py')
| -rw-r--r-- | synapse/crypto/keyring.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py index 35f810b07b..fce83d445f 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py @@ -352,7 +352,7 @@ class Keyring(object): logger.exception( "Unable to get key from %r: %s %s", perspective_name, - type(e).__name__, str(e.message), + type(e).__name__, str(e), ) defer.returnValue({}) @@ -384,7 +384,7 @@ class Keyring(object): logger.info( "Unable to get key %r for %r directly: %s %s", key_ids, server_name, - type(e).__name__, str(e.message), + type(e).__name__, str(e), ) if not keys: @@ -734,7 +734,7 @@ def _handle_key_deferred(verify_request): except IOError as e: logger.warn( "Got IOError when downloading keys for %s: %s %s", - server_name, type(e).__name__, str(e.message), + server_name, type(e).__name__, str(e), ) raise SynapseError( 502, @@ -744,7 +744,7 @@ def _handle_key_deferred(verify_request): except Exception as e: logger.exception( "Got Exception when downloading keys for %s: %s %s", - server_name, type(e).__name__, str(e.message), + server_name, type(e).__name__, str(e), ) raise SynapseError( 401, |