Browse Source

import paymentrequests only when really needed

283
ThomasV 11 years ago
parent
commit
36cee62849
  1. 13
      gui/qt/main_window.py
  2. 10
      lib/paymentrequest.py

13
gui/qt/main_window.py

@ -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
@ -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

10
lib/paymentrequest.py

@ -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")
@ -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:
@ -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))

Loading…
Cancel
Save