From b104d0a5bb8b31bc2dd58fed97e5c060f3764a82 Mon Sep 17 00:00:00 2001 From: quadrismegistus Date: Sun, 13 Sep 2020 15:48:26 +0100 Subject: [PATCH] updates --- komrade/backend/komrades.py | 6 ++++-- komrade/cli/cli.py | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/komrade/backend/komrades.py b/komrade/backend/komrades.py index a2c8399..e2bf7ba 100644 --- a/komrade/backend/komrades.py +++ b/komrade/backend/komrades.py @@ -229,11 +229,13 @@ class Komrade(Caller): msg[ROUTE_KEYNAME]=route return super().ring_ring(msg,caller=self,**y) + + def send_msg_to(self,msg,to_whom): - msg = self.compose_msg_to(msg,to_whom) + msg_e2e = self.compose_msg_to(msg,to_whom) msg.encrypt() - {'_route':'deliver_to', 'msg':msg} + {'_route':'deliver_msg_to', 'msg':msg} return self.ring_ring(msg) diff --git a/komrade/cli/cli.py b/komrade/cli/cli.py index 1d7431a..0707c2d 100644 --- a/komrade/cli/cli.py +++ b/komrade/cli/cli.py @@ -34,8 +34,8 @@ class CLI(Logger): try: inp=input(f'@{self.name if self.name else "?"}: ') # print(inp,'??') - except KeyboardInterrupt: - exit() + except (KeyboardInterrupt,EOFError) as e: + exit('\nGoodbye.') self.route(inp) #await asyncio.sleep(0.5)