More .make_subtype refactoring.

diff --git a/ircplom/client.py b/ircplom/client.py
index 717abb2dfedcab111227e83d4bc9ed23cb0b538f..a0bd6e200e53bb7cfaf0f49cb9cf06bc0be74267 100644 (file)
--- a/ircplom/client.py
+++ b/ircplom/client.py
@@ -55,6 +55,9 @@ class ClientQueueMixin(QueueMixin):
         self._put(event_class(client_id=getattr(self, self.client_id_name),
                               **kwargs))
 
+    def _cputs(self, method_to_call: str, **kwargs) -> None:
+        self._cput(ClientEvent.make_subtype(method_to_call, **kwargs))
+
 
 @dataclass
 class _ServerCapability:
@@ -196,7 +199,7 @@ class Client(ABC, ClientQueueMixin):
                                            port=self.conn_setup.port,
                                            q_out=self.q_out,
                                            client_id=self.id_)
-                self._cput(ClientEvent.make_subtype('on_connect'))
+                self._cputs('on_connect')
             except IrcConnAbortException as e:
                 self.log.alert(str(e))
             except Exception as e:  # pylint: disable=broad-exception-caught

diff --git a/ircplom/client_tui.py b/ircplom/client_tui.py
index 368fd5820c20b8d7fd9814cd8269871d7c7d6a06..262a2c9ccf5e59bd33b68d29d40f3cb27299713b 100644 (file)
--- a/ircplom/client_tui.py
+++ b/ircplom/client_tui.py
@@ -6,8 +6,8 @@ from getpass import getuser
 from ircplom.tui_base import (BaseTui, PromptWidget, TuiEvent, Window,
                               CMD_SHORTCUTS)
 from ircplom.irc_conn import IrcMessage
-from ircplom.client import (CHAT_GLOB, IrcConnSetup, Client, ClientEvent,
-                            ClientIdMixin, ClientQueueMixin, NewClientEvent)
+from ircplom.client import (CHAT_GLOB, IrcConnSetup, Client, ClientIdMixin,
+                            ClientQueueMixin, NewClientEvent)
 
 
 CMD_SHORTCUTS['connect'] = 'window.connect'
@@ -54,8 +54,7 @@ class _ClientWindow(Window, ClientQueueMixin):
         return f'{super().status_title}|{self.client_id}|{self.chat}'
 
     def _send_msg(self, verb: str, params: tuple[str, ...], **kwargs) -> None:
-        self._cput(ClientEvent.make_subtype(
-            'send', msg=IrcMessage(verb=verb, params=params), **kwargs))
+        self._cputs('send', msg=IrcMessage(verb=verb, params=params), **kwargs)
 
     def cmd__disconnect(self, quit_msg: str = 'ircplom says bye') -> None:
         'Send QUIT command to server.'
@@ -70,7 +69,7 @@ class _ClientWindow(Window, ClientQueueMixin):
         if host_port:
             self._parent.cmd__connect(host_port, nickname_pw, realname)
         else:
-            self._cput(ClientEvent.make_subtype('start_connecting'))
+            self._cputs('start_connecting')
 
     def cmd__nick(self, new_nick: str) -> None:
         'Attempt nickname change.'