diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-09-27 23:39:45 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-27 23:39:45 +1000 |
| commit | a512e637ac0df0d32559af64418691a2829800a6 (patch) | |
| tree | a7c14c4053e9a051d13b53c5c03391183e64ef34 /synapse/handlers | |
| parent | Run our oldest supported configuration in CI (#3952) (diff) | |
| parent | Update 3970.bugfix (diff) | |
| download | synapse-a512e637ac0df0d32559af64418691a2829800a6.tar.xz | |
Merge pull request #3970 from schnuffle/develop-py3
Replaced all occurences of e.message with str(e)
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/e2e_keys.py | 2 | ||||
| -rw-r--r-- | synapse/handlers/profile.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/e2e_keys.py b/synapse/handlers/e2e_keys.py index 578e9250fb..9dc46aa15f 100644 --- a/synapse/handlers/e2e_keys.py +++ b/synapse/handlers/e2e_keys.py @@ -341,7 +341,7 @@ class E2eKeysHandler(object): def _exception_to_failure(e): if isinstance(e, CodeMessageException): return { - "status": e.code, "message": e.message, + "status": e.code, "message": str(e), } if isinstance(e, NotRetryingDestination): diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py index 75b8b7ce6a..f284d5a385 100644 --- a/synapse/handlers/profile.py +++ b/synapse/handlers/profile.py @@ -278,7 +278,7 @@ class BaseProfileHandler(BaseHandler): except Exception as e: logger.warn( "Failed to update join event for room %s - %s", - room_id, str(e.message) + room_id, str(e) ) |