AaronFiore/electrum
1
0
Fork 0
Code Activity

python3: remove calls to unicode function

Browse Source
This commit is contained in:
ThomasV
2017-08-08 11:12:44 +02:00
parent 033a5c6c91
commit 15642ec8de
5 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gui/kivy/uix/dialogs/installwizard.py
View File

@@ -704,7 +704,7 @@ class AddXpubDialog(WizardDialog):
def get_text(self):
ti = self.ids.text_input
return unicode(ti.text).strip()
return ti.text.strip()
def get_params(self, button):
return (self.get_text(),)
@@ -715,7 +715,7 @@ class AddXpubDialog(WizardDialog):
self.app.scan_qr(on_complete)
def do_paste(self):
self.ids.text_input.text = test_xpub if is_test else unicode(self.app._clipboard.paste())
self.ids.text_input.text = test_xpub if is_test else self.app._clipboard.paste()
def do_clear(self):
self.ids.text_input.text = ''

6
gui/qt/installwizard.py
View File

@@ -176,7 +176,7 @@ class InstallWizard(QDialog, MessageBoxMixin, BaseWizard):
wallet_folder = os.path.dirname(self.storage.path)
def on_choose():
path = unicode(QFileDialog.getOpenFileName(self, "Select your wallet file", wallet_folder))
path = QFileDialog.getOpenFileName(self, "Select your wallet file", wallet_folder)
if path:
self.name_e.setText(path)
@@ -222,7 +222,7 @@ class InstallWizard(QDialog, MessageBoxMixin, BaseWizard):
if not self.storage.file_exists():
break
if self.storage.file_exists() and self.storage.is_encrypted():
password = unicode(self.pw_e.text())
password = self.pw_e.text()
try:
self.storage.decrypt(password)
break
@@ -467,7 +467,7 @@ class InstallWizard(QDialog, MessageBoxMixin, BaseWizard):
line = QLineEdit()
line.setText(default)
def f(text):
self.next_button.setEnabled(test(unicode(text)))
self.next_button.setEnabled(test(text))
line.textEdited.connect(f)
vbox.addWidget(line)
vbox.addWidget(WWLabel(warning))