Merge pull request #3150 from NotAFile/py3-listcomp-yield

Don't yield in list comprehensions
This commit is contained in:
Richard van der Hoff 2018-04-30 01:11:41 +01:00 committed by GitHub
commit 3b0e431c82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -262,11 +262,15 @@ class ApplicationServicesHandler(object):
event based on the service regex. event based on the service regex.
""" """
services = self.store.get_app_services() services = self.store.get_app_services()
interested_list = [
s for s in services if ( # we can't use a list comprehension here. Since python 3, list
yield s.is_interested(event, self.store) # comprehensions use a generator internally. This means you can't yield
) # inside of a list comprehension anymore.
] interested_list = []
for s in services:
if (yield s.is_interested(event, self.store)):
interested_list.append(s)
defer.returnValue(interested_list) defer.returnValue(interested_list)
def _get_services_for_user(self, user_id): def _get_services_for_user(self, user_id):