summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorSchnuffle <schnuffle@gotec-cafe.de>2018-09-27 13:38:50 +0200
committerSchnuffle <schnuffle@gotec-cafe.de>2018-09-27 13:38:50 +0200
commitdc5db01ff25dac6ec74ceea9b4d815a8c43cd7dd (patch)
tree7d60636ecf51d8cfef4340326b99b6506f4cccfd /synapse/handlers
parentMerge pull request #3963 from matrix-org/rav/get_state_for_room_docstring (diff)
downloadsynapse-dc5db01ff25dac6ec74ceea9b4d815a8c43cd7dd.tar.xz
Replaced all occurences of e.message with str(e)
Signed-off-by: Schnuffle  <schnuffle@github.com>
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/e2e_keys.py2
-rw-r--r--synapse/handlers/profile.py2
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)
                 )