timport paymentrequests only when really needed - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 36cee628493b9bb07ab1d2d09eaae1ae428e1569
DIR parent 58c302a4cf9fcd1fcef5b8f0976d33f1c98cddf2
HTML Author: ThomasV <thomasv@gitorious>
Date: Fri, 13 Jun 2014 16:25:25 +0200
import paymentrequests only when really needed
Diffstat:
M gui/qt/main_window.py | 13 ++++++++++---
M lib/paymentrequest.py | 10 +---------
2 files changed, 11 insertions(+), 12 deletions(-)
---
DIR diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
t@@ -41,9 +41,6 @@ from electrum import mnemonic
from electrum import util, bitcoin, commands, Interface, Wallet
from electrum import SimpleConfig, Wallet, WalletStorage
-from electrum.paymentrequest import PR_UNPAID, PR_PAID
-
-
from electrum import bmp, pyqrnative
from amountedit import AmountEdit, BTCAmountEdit, MyLineEdit
t@@ -65,6 +62,16 @@ elif platform.system() == 'Darwin':
else:
MONOSPACE_FONT = 'monospace'
+
+
+# status of payment requests
+PR_UNPAID = 0
+PR_EXPIRED = 1
+PR_SENT = 2 # sent but not propagated
+PR_PAID = 3 # send and propagated
+PR_ERROR = 4 # could not parse
+
+
from electrum import ELECTRUM_VERSION
import re
DIR diff --git a/lib/paymentrequest.py b/lib/paymentrequest.py
t@@ -49,13 +49,6 @@ import x509
REQUEST_HEADERS = {'Accept': 'application/bitcoin-paymentrequest', 'User-Agent': 'Electrum'}
ACK_HEADERS = {'Content-Type':'application/bitcoin-payment','Accept':'application/bitcoin-paymentack','User-Agent':'Electrum'}
-# status can be:
-PR_UNPAID = 0
-PR_EXPIRED = 1
-PR_SENT = 2 # sent but not propagated
-PR_PAID = 3 # send and propagated
-PR_ERROR = 4 # could not parse
-
ca_list = {}
ca_path = os.path.expanduser("~/.electrum/ca/ca-bundle.crt")
t@@ -64,7 +57,6 @@ ca_path = os.path.expanduser("~/.electrum/ca/ca-bundle.crt")
def load_certificates():
-
try:
ca_f = open(ca_path, 'r')
except Exception:
t@@ -84,7 +76,7 @@ def load_certificates():
try:
x.parse(c)
except Exception as e:
- print "cannot parse cert:", e
+ util.print_error("cannot parse cert:", e)
ca_list[x.getFingerprint()] = x
ca_f.close()
util.print_error("%d certificates"%len(ca_list))