From f422390877dbe5702975996818029cd5478e92ad Mon Sep 17 00:00:00 2001 From: quadrismegistus Date: Wed, 9 Sep 2020 16:41:33 +0100 Subject: [PATCH] updates --- komrade/backend/keymaker.py | 2 +- komrade/backend/operators.py | 2 +- komrade/backend/people.py | 12 +++++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/komrade/backend/keymaker.py b/komrade/backend/keymaker.py index e12d0a4..9e7936d 100644 --- a/komrade/backend/keymaker.py +++ b/komrade/backend/keymaker.py @@ -101,7 +101,7 @@ class Keymaker(Logger): res = self.crypt_keys.get(self.name, prefix='/pubkey/') if res: return res - res = b64decode(self.load_qr(self.name).encode()) + res = self.load_qr(self.name) if res: return res self.log('I don\'t know my public key!') diff --git a/komrade/backend/operators.py b/komrade/backend/operators.py index daa1bac..bb1d154 100644 --- a/komrade/backend/operators.py +++ b/komrade/backend/operators.py @@ -60,7 +60,7 @@ class Operator(Keymaker): def compose_msg_to(self,msg,another): if not self.privkey or not self.pubkey: - raise KomradeException('why do I have no pub/privkey pair!?',self,self.name) + raise KomradeException('why do I have no pub/privkey pair!?',self,self.name,self.pubkey,self.privkey,self.keychain()) if not another.name or not another.pubkey: raise KomradeException('why do I not know whom I\'m writing to?') diff --git a/komrade/backend/people.py b/komrade/backend/people.py index 89aec3b..7708e97 100644 --- a/komrade/backend/people.py +++ b/komrade/backend/people.py @@ -65,7 +65,7 @@ class Person(Caller): return self.ring_ring(msg,to_whom) def ring_ring(self,msg,to_whom): - return super().super().ring_ring( + return super(Caller,self).ring_ring( msg, to_whom, get_resp_from=super().ring_ring @@ -187,6 +187,12 @@ class Person(Caller): if __name__=='__main__': - person = Person('marx') + marx = Person('marx') + elon = Person('elon') - person.register() \ No newline at end of file + marx.register() + elon.register() + # person.register() + # print(person.pubkey) + + elon.send_msg_to('youre dumb',marx) \ No newline at end of file