trevert commit 3863ee - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit cdefecc16b8622efef9389e5c35e16096899e8af
DIR parent c908c7e9a3ce13004818a69630c1f61701c9c8c0
HTML Author: ThomasV <thomasv@gitorious>
Date: Sat, 6 Sep 2014 10:03:17 +0200
revert commit 3863ee
Diffstat:
M gui/qt/paytoedit.py | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
---
DIR diff --git a/gui/qt/paytoedit.py b/gui/qt/paytoedit.py
t@@ -23,7 +23,6 @@ from qrtextedit import QRTextEdit
import re
from decimal import Decimal
from electrum import bitcoin
-from electrum.i18n import _
RE_ADDRESS = '[1-9A-HJ-NP-Za-km-z]{26,}'
RE_ALIAS = '(.*?)\s*\<([1-9A-HJ-NP-Za-km-z]{26,})\>'
t@@ -115,29 +114,15 @@ class PayToEdit(QRTextEdit):
self.unlock_amount()
return
- errors = []
- errtext = ""
- for i, line in enumerate(lines):
+ for line in lines:
try:
type, to_address, amount = self.parse_address_and_amount(line)
except:
- x, y = line.split(',')
- r = x.strip()
- m = re.match('^'+RE_ALIAS+'$', r)
- address = m.group(2) if m else r
- errors.append((i, address))
continue
outputs.append((type, to_address, amount))
total += amount
- if errors != []:
- for x in errors:
- errtext += "Line #" + str(x[0]+1) + ": " + x[1] + "\n"
- QMessageBox.critical(None, _("Invalid Addresses"), _("ABORTING! Invalid Addresses found:") + "\n\n" + errtext)
- self.clear()
- return
-
self.outputs = outputs
self.payto_address = None