From e151d2005bd805af085b94df5334b3eb692826e2 Mon Sep 17 00:00:00 2001 From: Matthias Bisping Date: Wed, 11 May 2022 17:01:56 +0200 Subject: [PATCH] refactoring --- pyinfra/server/bufferizer/lazy_bufferizer.py | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pyinfra/server/bufferizer/lazy_bufferizer.py b/pyinfra/server/bufferizer/lazy_bufferizer.py index df5d85b..629c6dc 100644 --- a/pyinfra/server/bufferizer/lazy_bufferizer.py +++ b/pyinfra/server/bufferizer/lazy_bufferizer.py @@ -83,7 +83,7 @@ class InputOutputBuffer: class QueueBufferCoupler: def __init__(self, queue: Queue, buffer: InputOutputBuffer): - self.queue_streamer = QueueStreamer(queue) + self.queue = queue self.buffer = buffer self.result_stream = self.compute() @@ -99,7 +99,7 @@ class QueueBufferCoupler: yield self.__signal_termination() def __consume_queue(self): - queue_items = takewhile(is_not_nothing, self.queue_streamer()) + queue_items = takewhile(is_not_nothing, stream_queue(self.queue)) yield from chain.from_iterable(map(self.__add_to_buffer_and_consume, queue_items)) def __flush_buffer(self): @@ -114,13 +114,6 @@ class QueueBufferCoupler: return Nothing -class QueueStreamer: - def __init__(self, queue: Queue): - self.queue = queue - - def __call__(self): - return self.stream_queue() - - def stream_queue(self): - yield from repeatedly(self.queue.popleft) - yield Nothing +def stream_queue(queue): + yield from repeatedly(queue.popleft) + yield Nothing