use certifi directly instead of requests
This commit is contained in:
@@ -33,7 +33,7 @@ from collections import defaultdict
|
||||
|
||||
import aiorpcx
|
||||
from aiorpcx import RPCSession, Notification
|
||||
import requests
|
||||
import certifi
|
||||
|
||||
from .util import PrintError, ignore_exceptions, log_exceptions, bfh, SilentTaskGroup
|
||||
from . import util
|
||||
@@ -49,7 +49,7 @@ if TYPE_CHECKING:
|
||||
from .network import Network
|
||||
|
||||
|
||||
ca_path = requests.certs.where()
|
||||
ca_path = certifi.where()
|
||||
|
||||
|
||||
class NotificationSession(RPCSession):
|
||||
|
||||
@@ -28,7 +28,7 @@ import time
|
||||
import traceback
|
||||
import json
|
||||
|
||||
import requests
|
||||
import certifi
|
||||
import urllib.parse
|
||||
import aiohttp
|
||||
|
||||
@@ -49,7 +49,7 @@ from .network import Network
|
||||
REQUEST_HEADERS = {'Accept': 'application/bitcoin-paymentrequest', '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_keyID = None
|
||||
|
||||
|
||||
@@ -45,7 +45,7 @@ import ssl
|
||||
import aiohttp
|
||||
from aiohttp_socks import SocksConnector, SocksVer
|
||||
from aiorpcx import TaskGroup
|
||||
import requests
|
||||
import certifi
|
||||
|
||||
from .i18n import _
|
||||
|
||||
@@ -59,7 +59,7 @@ def inv_dict(d):
|
||||
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}
|
||||
|
||||
@@ -337,8 +337,8 @@ def load_certificates(ca_path):
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
import requests
|
||||
import certifi
|
||||
|
||||
util.set_verbosity(True)
|
||||
ca_path = requests.certs.where()
|
||||
ca_path = certifi.where()
|
||||
ca_list, ca_keyID = load_certificates(ca_path)
|
||||
|
||||
Reference in New Issue
Block a user