Compare commits

...

2 Commits

Author SHA1 Message Date
mathieui
24375f3c47 Release slix 1.7.1 2021-04-30 18:52:13 +02:00
mathieui
8b90cdd73f xmlstream: fix slow tasks scheduling
- wrong attribute used
- some mistakes in the slow tasks function
2021-04-30 18:51:07 +02:00
2 changed files with 10 additions and 6 deletions

View File

@ -9,5 +9,5 @@
# We don't want to have to import the entire library # We don't want to have to import the entire library
# just to get the version info for setup.py # just to get the version info for setup.py
__version__ = '1.7.0' __version__ = '1.7.1'
__version_info__ = (1, 7, 0) __version_info__ = (1, 7, 1)

View File

@ -1007,11 +1007,13 @@ class XMLStream(asyncio.BaseProtocol):
""" """
data = await task data = await task
self.__slow_tasks.remove(task) self.__slow_tasks.remove(task)
for filter in self.__filters['out']: if data is None:
return
for filter in self.__filters['out'][:]:
if filter in already_used: if filter in already_used:
continue continue
if iscoroutinefunction(filter): if iscoroutinefunction(filter):
data = await task data = await filter(data)
else: else:
data = filter(data) data = filter(data)
if data is None: if data is None:
@ -1047,7 +1049,7 @@ class XMLStream(asyncio.BaseProtocol):
timeout=1, timeout=1,
) )
if pending: if pending:
self.slow_tasks.append(task) self.__slow_tasks.append(task)
asyncio.ensure_future( asyncio.ensure_future(
self._continue_slow_send( self._continue_slow_send(
task, task,
@ -1055,7 +1057,9 @@ class XMLStream(asyncio.BaseProtocol):
), ),
loop=self.loop, loop=self.loop,
) )
raise Exception("Slow coro, rescheduling") raise ContinueQueue(
"Slow coroutine, rescheduling filters"
)
data = task.result() data = task.result()
else: else:
data = filter(data) data = filter(data)