summary refs log tree commit diff
path: root/synapse/storage/roommember.py
diff options
context:
space:
mode:
authorRichard van der Hoff <github@rvanderhoff.org.uk>2017-10-23 17:39:31 +0100
committerGitHub <noreply@github.com>2017-10-23 17:39:31 +0100
commit0d437698b2e040eface5094852576c43916c2e0c (patch)
tree9090c6c6f5ba5566786b8654cee07b3c3acd97c8 /synapse/storage/roommember.py
parentMerge pull request #2566 from matrix-org/rav/media_logcontext_leak (diff)
parentfix vars named `l` (diff)
downloadsynapse-0d437698b2e040eface5094852576c43916c2e0c.tar.xz
Merge pull request #2568 from matrix-org/rav/pep8
PEP8 fixes
Diffstat (limited to 'synapse/storage/roommember.py')
-rw-r--r--synapse/storage/roommember.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py
index a0fc9a6867..3fa8019eb7 100644
--- a/synapse/storage/roommember.py
+++ b/synapse/storage/roommember.py
@@ -636,7 +636,7 @@ class RoomMemberStore(SQLBaseStore):
                 room_id = row["room_id"]
                 try:
                     content = json.loads(row["content"])
-                except:
+                except Exception:
                     continue
 
                 display_name = content.get("displayname", None)