commit 51b62c29831a5c892eb4ac2eac2f59f44bbce342
parent 9f4a9145261bd0ef2ad788ef269004eeec4bdfff
Author: ThomasV <thomasv@gitorious>
Date: Sat, 2 May 2015 14:40:47 +0200
strip transaction text before parsing
Diffstat:
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
@@ -2066,37 +2066,27 @@ class ElectrumWindow(QMainWindow):
d = QDialog(self)
d.setModal(1)
d.setWindowTitle(_("Enter Password"))
-
pw = QLineEdit()
pw.setEchoMode(2)
-
vbox = QVBoxLayout()
if not msg:
msg = _('Please enter your password')
vbox.addWidget(QLabel(msg))
-
grid = QGridLayout()
grid.setSpacing(8)
grid.addWidget(QLabel(_('Password')), 1, 0)
grid.addWidget(pw, 1, 1)
vbox.addLayout(grid)
-
vbox.addLayout(Buttons(CancelButton(d), OkButton(d)))
d.setLayout(vbox)
-
run_hook('password_dialog', pw, grid, 1)
if not d.exec_(): return
return unicode(pw.text())
-
-
-
-
-
-
def tx_from_text(self, txt):
"json or raw hexadecimal"
+ txt = txt.strip()
try:
txt.decode('hex')
is_hex = True