Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor syntax neatenings

This commit is contained in:
Paul "LeoNerd" Evans 2016-08-18 16:58:25 +01:00
parent fcf1dec809
commit 2a91799fcc
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/appservice/api.py
View File

@ -73,7 +73,7 @@ class ApplicationServiceApi(SimpleHttpClient):
@defer.inlineCallbacks @defer.inlineCallbacks
def query_3pu(self, service, protocol, fields): def query_3pu(self, service, protocol, fields):
uri = service.url + ("/3pu/%s" % urllib.quote(protocol)) uri = "%s/3pu/%s" % (service.url, urllib.quote(protocol))
response = None response = None
try: try:
response = yield self.get_json(uri, fields) response = yield self.get_json(uri, fields)
@ -84,7 +84,7 @@ class ApplicationServiceApi(SimpleHttpClient):
@defer.inlineCallbacks @defer.inlineCallbacks
def query_3pl(self, service, protocol, fields): def query_3pl(self, service, protocol, fields):
uri = service.url + ("/3pl/%s" % urllib.quote(protocol)) uri = "%s/3pl/%s" % (service.url, urllib.quote(protocol))
response = None response = None
try: try:
response = yield self.get_json(uri, fields) response = yield self.get_json(uri, fields)

22
synapse/handlers/appservice.py
View File

@ -172,13 +172,10 @@ class ApplicationServicesHandler(object):
def query_3pu(self, protocol, fields): def query_3pu(self, protocol, fields):
services = yield self._get_services_for_3pn(protocol) services = yield self._get_services_for_3pn(protocol)
deferreds = [] results = yield defer.DeferredList([
for service in services: self.appservice_api.query_3pu(service, protocol, fields)
deferreds.append(self.appservice_api.query_3pu( for service in services
service, protocol, fields ], consumeErrors=True)
))
results = yield defer.DeferredList(deferreds, consumeErrors=True)
ret = [] ret = []
for (success, result) in results: for (success, result) in results:
@ -199,13 +196,10 @@ class ApplicationServicesHandler(object):
def query_3pl(self, protocol, fields): def query_3pl(self, protocol, fields):
services = yield self._get_services_for_3pn(protocol) services = yield self._get_services_for_3pn(protocol)
deferreds = [] results = yield defer.DeferredList([
for service in services: self.appservice_api.query_3pl(service, protocol, fields)
deferreds.append(self.appservice_api.query_3pl( for service in services
service, protocol, fields ], consumeErrors=True)
))
results = yield defer.DeferredList(deferreds, consumeErrors=True)
ret = [] ret = []
for (success, result) in results: for (success, result) in results: