From 60e0b43b8129fe1b66a6ceeb9f2dc01a5b6de1b4 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Mon, 13 Nov 2017 11:10:51 +0100 Subject: [PATCH] fix 3262: protobuf SerializeToString() returns bytes.. --- lib/paymentrequest.py | 2 +- lib/wallet.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/paymentrequest.py b/lib/paymentrequest.py index 9d80e2ea..8c9c6009 100644 --- a/lib/paymentrequest.py +++ b/lib/paymentrequest.py @@ -411,7 +411,7 @@ def sign_request_with_x509(pr, key_path, cert_path): s = f.read() bList = pem.dePemList(s, "CERTIFICATE") certificates = pb2.X509Certificates() - certificates.certificate.extend(map(str, bList)) + certificates.certificate.extend(map(bytes, bList)) pr.pki_type = 'x509+sha256' pr.pki_data = certificates.SerializeToString() msgBytes = bytearray(pr.SerializeToString()) diff --git a/lib/wallet.py b/lib/wallet.py index 15e8b1ba..abc26e5d 100644 --- a/lib/wallet.py +++ b/lib/wallet.py @@ -1292,7 +1292,7 @@ class Abstract_Wallet(PrintError): except OSError as exc: if exc.errno != errno.EEXIST: raise - with open(os.path.join(path, key), 'w') as f: + with open(os.path.join(path, key), 'wb') as f: f.write(pr.SerializeToString()) # reload req = self.get_payment_request(addr, config)