From c0380402bc0c736a88db35a48ad554cbc2770fa6 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 3 May 2017 10:56:22 +0100
Subject: List caught expection types

---
 synapse/http/client.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synapse/http/client.py b/synapse/http/client.py
index 379ddcb540..f8dff37d24 100644
--- a/synapse/http/client.py
+++ b/synapse/http/client.py
@@ -260,7 +260,7 @@ class SimpleHttpClient(object):
             errcode = jsonBody['errcode']
             error = jsonBody['error']
             return MatrixCodeMessageException(response.code, error, errcode)
-        except:
+        except (ValueError, KeyError) as e:
             return CodeMessageException(response.code, body)
 
     # XXX: FIXME: This is horribly copy-pasted from matrixfederationclient.
-- 
cgit 1.4.1