From 09abb0331d07f5c6ea21e308047b0fb3ec232d92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= Date: Sun, 16 Dec 2018 19:04:51 +0100 Subject: [PATCH] Refactor PipeIOServer.__init__() --- pipe_io_server/pipe_io_server.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pipe_io_server/pipe_io_server.py b/pipe_io_server/pipe_io_server.py index 8a7398c..5568f49 100644 --- a/pipe_io_server/pipe_io_server.py +++ b/pipe_io_server/pipe_io_server.py @@ -26,14 +26,9 @@ class PipeHandler: class PipeIOServer(ABC): def __init__(self, in_pipe=None, out_pipe=None): self.in_pipe, self.out_pipe = in_pipe, out_pipe + self._io_threads = None self._create_pipes() - - io_threads_dict = { - 'reader': PipeReaderThread(self.in_pipe, self._handle_message), - 'writer': PipeWriterThread(self.out_pipe) - } - IOThreadsTuple = namedtuple('IOThreadsTuple', sorted(io_threads_dict.keys())) - self._io_threads = IOThreadsTuple(**io_threads_dict) + self._init_io_threads() def _create_pipes(self): if not self.in_pipe or not self.out_pipe: @@ -42,6 +37,14 @@ class PipeIOServer(ABC): self.out_pipe = join('/tmp', f'out_pipe_{pipe_id}') PipeHandler(self.in_pipe, self.out_pipe).recreate() + def _init_io_threads(self): + io_threads_dict = { + 'reader': PipeReaderThread(self.in_pipe, self._handle_message), + 'writer': PipeWriterThread(self.out_pipe) + } + IOThreadsTuple = namedtuple('IOThreadsTuple', sorted(io_threads_dict.keys())) + self._io_threads = IOThreadsTuple(**io_threads_dict) + @abstractmethod def _handle_message(self, message): raise NotImplementedError()