From b3511adb920f81f8847e4cf3112018df08466ad6 Mon Sep 17 00:00:00 2001
From: "Paul \"LeoNerd\" Evans" <paul@matrix.org>
Date: Thu, 18 Aug 2016 13:45:18 +0100
Subject: [PATCH] Don't catch the return-value-as-exception that
 @defer.inlineCallbacks will use

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

diff --git a/synapse/appservice/api.py b/synapse/appservice/api.py
index bfc1866591..39b4bff556 100644
--- a/synapse/appservice/api.py
+++ b/synapse/appservice/api.py
@@ -78,7 +78,7 @@ class ApplicationServiceApi(SimpleHttpClient):
         try:
             response = yield self.get_json(uri, fields)
             defer.returnValue(response)
-        except:
+        except Exception:
             # TODO: would be noisy to log lookup failures, but we want to log
             # other things. Hrm.
             defer.returnValue([])