Update upstream source from tag 'upstream/1.3.0'

Update to upstream version '1.3.0'
with Debian dir 54395ff9571288c53c6734deb0d56985424d2320

1 files changed, 2 insertions, 2 deletions

diff --git a/synapse/appservice/scheduler.py b/synapse/appservice/scheduler.py
index e5b36494..42a350bf 100644
--- a/synapse/appservice/scheduler.py
+++ b/synapse/appservice/scheduler.py
@@ -193,7 +193,7 @@ class _TransactionController(object):
     @defer.inlineCallbacks
     def _is_service_up(self, service):
         state = yield self.store.get_appservice_state(service)
-        defer.returnValue(state == ApplicationServiceState.UP or state is None)
+        return state == ApplicationServiceState.UP or state is None
 
 
 class _Recoverer(object):
@@ -208,7 +208,7 @@ class _Recoverer(object):
                 r.service.id,
             )
             r.recover()
-        defer.returnValue(recoverers)
+        return recoverers
 
     def __init__(self, clock, store, as_api, service, callback):
         self.clock = clock