From 7cf075c754bde9855395ad503c16d778036c2116 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Sun, 22 Oct 2017 15:14:09 +0200 Subject: [PATCH] follow up b8c7edf0702c17f4d411da72438f1bec19c6f18d --- gui/qt/qrtextedit.py | 1 - lib/qrscanner.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/gui/qt/qrtextedit.py b/gui/qt/qrtextedit.py index 8f452a88..d539f0ae 100644 --- a/gui/qt/qrtextedit.py +++ b/gui/qt/qrtextedit.py @@ -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 diff --git a/lib/qrscanner.py b/lib/qrscanner.py index c0af98ce..e231e643 100644 --- a/lib/qrscanner.py +++ b/lib/qrscanner.py @@ -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"