diff options
author | Jesse Luehrs <doy@tozt.net> | 2014-10-14 11:43:57 -0400 |
---|---|---|
committer | Jesse Luehrs <doy@tozt.net> | 2014-10-14 11:43:57 -0400 |
commit | 1385177753397b0debd744b23b85fd26a21401de (patch) | |
tree | 9aa8a6f8276e4db8edf07bc41bbfaba42d0d70d7 /termcast_client | |
parent | 01852eb74a4fdfa7fde436db90a5a3c755b25240 (diff) | |
download | python-termcast-client-1385177753397b0debd744b23b85fd26a21401de.tar.gz python-termcast-client-1385177753397b0debd744b23b85fd26a21401de.zip |
remove some unnecessary lambdas
Diffstat (limited to 'termcast_client')
-rw-r--r-- | termcast_client/__init__.py | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/termcast_client/__init__.py b/termcast_client/__init__.py index c3c8a55..4db9eae 100644 --- a/termcast_client/__init__.py +++ b/termcast_client/__init__.py @@ -20,33 +20,28 @@ class Client(object): sock.connect((self.host, self.port)) sock.send(self._build_connection_string()) self.winch_set = False + self.sock = sock pity.spawn( argv, - lambda fd: self._master_read(fd, sock), + self._master_read, handle_window_size=True ) - def _master_read(self, fd, sock): + def _master_read(self, fd): if not self.winch_set: - prev_handler = signal.getsignal(signal.SIGWINCH) - signal.signal( - signal.SIGWINCH, - lambda signum, frame: self._winch( - sock, - lambda: prev_handler(signum, frame) - ) - ) + self.prev_handler = signal.getsignal(signal.SIGWINCH) + signal.signal(signal.SIGWINCH, self._winch) self.winch_set = True data = os.read(fd, 1024) - sock.send(data) + self.sock.send(data) return data - def _winch(self, sock, prev_handler): - prev_handler() + def _winch(self, signum, frame): + self.prev_handler(signum, frame) # XXX a bit racy - should try to avoid splitting existing escape # sequences - sock.send(self._build_winsize_metadata_string()) + self.sock.send(self._build_winsize_metadata_string()) def _build_connection_string(self): auth = ( |