MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-11-16 15:01:23 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3103 from NotAFile/py3-baseexcepton-message

Browse source 
Use str(e) instead of e.message
This commit is contained in:
Richard van der Hoff 2018-04-20 15:34:49 +01:00 committed by GitHub
commit 692a3cc806
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
synapse/crypto/keyring.py
View file

@ -352,7 +352,7 @@ class Keyring(object):
logger.exception( logger.exception(
"Unable to get key from %r: %s %s", "Unable to get key from %r: %s %s",
perspective_name, perspective_name,
type(e).__name__, str(e.message), type(e).__name__, str(e),
) )
defer.returnValue({}) defer.returnValue({})
@ -384,7 +384,7 @@ class Keyring(object):
logger.info( logger.info(
"Unable to get key %r for %r directly: %s %s", "Unable to get key %r for %r directly: %s %s",
key_ids, server_name, key_ids, server_name,
type(e).__name__, str(e.message), type(e).__name__, str(e),
) )
if not keys: if not keys:
@ -734,7 +734,7 @@ def _handle_key_deferred(verify_request):
except IOError as e: except IOError as e:
logger.warn( logger.warn(
"Got IOError when downloading keys for %s: %s %s", "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( raise SynapseError(
502, 502,
@ -744,7 +744,7 @@ def _handle_key_deferred(verify_request):
except Exception as e: except Exception as e:
logger.exception( logger.exception(
"Got Exception when downloading keys for %s: %s %s", "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( raise SynapseError(
401, 401,

12
tests/storage/test_appservice.py
View file

@ -480,9 +480,9 @@ class ApplicationServiceStoreConfigTestCase(unittest.TestCase):
ApplicationServiceStore(None, hs) ApplicationServiceStore(None, hs)
e = cm.exception e = cm.exception
self.assertIn(f1, e.message) self.assertIn(f1, str(e))
self.assertIn(f2, e.message) self.assertIn(f2, str(e))
self.assertIn("id", e.message) self.assertIn("id", str(e))
@defer.inlineCallbacks @defer.inlineCallbacks
def test_duplicate_as_tokens(self): def test_duplicate_as_tokens(self):
@ -504,6 +504,6 @@ class ApplicationServiceStoreConfigTestCase(unittest.TestCase):
ApplicationServiceStore(None, hs) ApplicationServiceStore(None, hs)
e = cm.exception e = cm.exception
self.assertIn(f1, e.message) self.assertIn(f1, str(e))
self.assertIn(f2, e.message) self.assertIn(f2, str(e))
self.assertIn("as_token", e.message) self.assertIn("as_token", str(e))