LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-09-01 17:55:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use certifi directly instead of requests

Browse source
This commit is contained in:
SomberNight 2018-12-13 23:11:59 +01:00
parent c09ac41b27
commit 78f5afff74
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
6 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
contrib/requirements/requirements.txt
View file

@ -9,3 +9,4 @@ qdarkstyle<2.6
aiorpcx>=0.9,<0.11 aiorpcx>=0.9,<0.11
aiohttp aiohttp
aiohttp_socks aiohttp_socks
certifi

4
electrum/interface.py
View file

@ -33,7 +33,7 @@ from collections import defaultdict
import aiorpcx import aiorpcx
from aiorpcx import RPCSession, Notification from aiorpcx import RPCSession, Notification
import requests import certifi
from .util import PrintError, ignore_exceptions, log_exceptions, bfh, SilentTaskGroup from .util import PrintError, ignore_exceptions, log_exceptions, bfh, SilentTaskGroup
from . import util from . import util
@ -49,7 +49,7 @@ if TYPE_CHECKING:
from .network import Network from .network import Network
ca_path = requests.certs.where() ca_path = certifi.where()
class NotificationSession(RPCSession): class NotificationSession(RPCSession):

4
electrum/paymentrequest.py
View file

@ -28,7 +28,7 @@ import time
import traceback import traceback
import json import json
import requests import certifi
import urllib.parse import urllib.parse
import aiohttp import aiohttp
@ -49,7 +49,7 @@ from .network import Network
REQUEST_HEADERS = {'Accept': 'application/bitcoin-paymentrequest', 'User-Agent': 'Electrum'} REQUEST_HEADERS = {'Accept': 'application/bitcoin-paymentrequest', 'User-Agent': 'Electrum'}
ACK_HEADERS = {'Content-Type':'application/bitcoin-payment','Accept':'application/bitcoin-paymentack','User-Agent':'Electrum'} ACK_HEADERS = {'Content-Type':'application/bitcoin-payment','Accept':'application/bitcoin-paymentack','User-Agent':'Electrum'}
ca_path = requests.certs.where() # FIXME do we need to depend on requests here? ca_path = certifi.where()
ca_list = None ca_list = None
ca_keyID = None ca_keyID = None

4
electrum/util.py
View file

@ -45,7 +45,7 @@ import ssl
import aiohttp import aiohttp
from aiohttp_socks import SocksConnector, SocksVer from aiohttp_socks import SocksConnector, SocksVer
from aiorpcx import TaskGroup from aiorpcx import TaskGroup
import requests import certifi
from .i18n import _ from .i18n import _
@ -59,7 +59,7 @@ def inv_dict(d):
return {v: k for k, v in d.items()} return {v: k for k, v in d.items()}
ca_path = requests.certs.where() ca_path = certifi.where()
base_units = {'BTC':8, 'mBTC':5, 'bits':2, 'sat':0} base_units = {'BTC':8, 'mBTC':5, 'bits':2, 'sat':0}

4
electrum/x509.py
View file

@ -337,8 +337,8 @@ def load_certificates(ca_path):
if __name__ == "__main__": if __name__ == "__main__":
import requests import certifi
util.set_verbosity(True) util.set_verbosity(True)
ca_path = requests.certs.where() ca_path = certifi.where()
ca_list, ca_keyID = load_certificates(ca_path) ca_list, ca_keyID = load_certificates(ca_path)

4
run_electrum
View file

@ -44,7 +44,7 @@ def check_imports():
import dns import dns
import pyaes import pyaes
import ecdsa import ecdsa
import requests import certifi
import qrcode import qrcode
import google.protobuf import google.protobuf
import jsonrpclib import jsonrpclib
@ -58,7 +58,7 @@ def check_imports():
from google.protobuf import descriptor_pb2 from google.protobuf import descriptor_pb2
from jsonrpclib import SimpleJSONRPCServer from jsonrpclib import SimpleJSONRPCServer
# make sure that certificates are here # make sure that certificates are here
assert os.path.exists(requests.utils.DEFAULT_CA_BUNDLE_PATH) assert os.path.exists(certifi.where())
if not is_android: if not is_android: