tMerge pull request #2997 from romanz/fix-amodem - electrum - Electrum Bitcoin wallet HTML git clone https://git.parazyd.org/electrum DIR Log DIR Files DIR Refs DIR Submodules --- DIR commit 13f13380d5f75fa8c0a1ddbfdbaa93ea0c49fe30 DIR parent 15ab48aaa8b291777086c95658f4808443c8a289 HTML Author: ThomasV <thomasv@electrum.org> Date: Thu, 5 Oct 2017 20:11:34 +0200 Merge pull request #2997 from romanz/fix-amodem amodem: fix str/bytes handling Diffstat: M plugins/audio_modem/qt.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- DIR diff --git a/plugins/audio_modem/qt.py b/plugins/audio_modem/qt.py t@@ -103,7 +103,7 @@ class Plugin(BasePlugin): amodem.main.send(config=self.modem_config, src=src, dst=dst) print_msg('Sending:', repr(blob)) - blob = zlib.compress(blob) + blob = zlib.compress(blob.encode('ascii')) kbps = self.modem_config.modem_bps / 1e3 msg = 'Sending to Audio MODEM ({0:.1f} kbps)...'.format(kbps) t@@ -119,7 +119,7 @@ class Plugin(BasePlugin): def on_finished(blob): if blob: - blob = zlib.decompress(blob) + blob = zlib.decompress(blob).decode('ascii') print_msg('Received:', repr(blob)) parent.setText(blob)