tfollow up b8c7edf0702c17f4d411da72438f1bec19c6f18d - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 7cf075c754bde9855395ad503c16d778036c2116
DIR parent 02cd5497eb5acd8f490f1bd1925883b1a3fdfed1
HTML Author: ThomasV <thomasv@electrum.org>
Date: Sun, 22 Oct 2017 15:14:09 +0200
follow up b8c7edf0702c17f4d411da72438f1bec19c6f18d
Diffstat:
M gui/qt/qrtextedit.py | 1 -
M lib/qrscanner.py | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
---
DIR diff --git a/gui/qt/qrtextedit.py b/gui/qt/qrtextedit.py
t@@ -61,7 +61,6 @@ class ScanQRTextEdit(ButtonsTextEdit, MessageBoxMixin):
except BaseException as e:
self.show_error(str(e))
data = ''
- data = str(data)
self.setText(data)
return data
DIR diff --git a/lib/qrscanner.py b/lib/qrscanner.py
t@@ -62,7 +62,7 @@ def scan_barcode(device='', timeout=-1, display=True, threaded=False):
return
symbol = libzbar.zbar_symbol_set_first_symbol(symbols)
data = libzbar.zbar_symbol_get_data(symbol)
- return data
+ return data.decode('utf8')
def _find_system_cameras():
device_root = "/sys/class/video4linux"