tMerge pull request #3045 from SomberNight/trezor_unicode - electrum - Electrum Bitcoin wallet HTML git clone https://git.parazyd.org/electrum DIR Log DIR Files DIR Refs DIR Submodules --- DIR commit 566b1689b93e63a4aa389d5a708f7b10fce3c411 DIR parent ccf1f0f5d12b5087f5a9f84364c9ebe2c73c6129 HTML Author: ThomasV <thomasv@electrum.org> Date: Mon, 16 Oct 2017 07:12:53 +0200 Merge pull request #3045 from SomberNight/trezor_unicode fix: rm unicode() calls in trezor plugin (py3) Diffstat: M plugins/trezor/qt_generic.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- DIR diff --git a/plugins/trezor/qt_generic.py b/plugins/trezor/qt_generic.py t@@ -213,7 +213,7 @@ class QtPlugin(QtPluginBase): vbox.addLayout(hl) def clean_text(widget): - text = unicode(widget.toPlainText()).strip() + text = widget.toPlainText().strip() return ' '.join(text.split()) if method in [TIM_NEW, TIM_RECOVER]: t@@ -281,7 +281,7 @@ class QtPlugin(QtPluginBase): item = ' '.join(str(clean_text(text)).split()) pin = str(pin.text()) - return (item, unicode(name.text()), pin, cb_phrase.isChecked()) + return (item, name.text(), pin, cb_phrase.isChecked()) t@@ -352,7 +352,7 @@ class SettingsDialog(WindowModalDialog): label_apply.setEnabled(label_edit.text() != self.features.label) def rename(): - invoke_client('change_label', unicode(label_edit.text())) + invoke_client('change_label', label_edit.text()) def toggle_passphrase(): title = _("Confirm Toggle Passphrase Protection")