river_tao/OneForAll-mirror
1
0
Fork 0
mirror of https://github.com/shmilylty/OneForAll.git synced 2026-11-01 23:05:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复requests使用时默认使用环境系统代理的问题

Browse Source
This commit is contained in:
JrD
2020-09-07 15:11:06 +08:00
parent 3407a84b8d
commit c2985352b1
4 changed files with 43 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/utils.py
+9 -3
View File
@@ -521,8 +521,10 @@ def check_net():
'http://www.apple.com', 'http://microsoft.com']
url = random.choice(urls)
logger.log('INFOR', f'Trying to access {url}')
session = requests.Session()
session.trust_env = False
try:
rsp = requests.get(url)
rsp = session.get(url, proxies=get_proxy())
except Exception as e:
logger.log('ERROR', e.args)
logger.log('ALERT', 'Can not access Internet, retrying')
@@ -565,8 +567,10 @@ def check_version(local):
proxy = get_proxy()
timeout = settings.request_timeout_second
verify = settings.request_ssl_verify
session = requests.Session()
session.trust_env = False
try:
resp = requests.get(url=api, headers=header, proxies=proxy,
resp = session.get(url=api, headers=header, proxies=proxy,
timeout=timeout, verify=verify)
resp_json = resp.json()
latest = resp_json['tag_name']
@@ -705,8 +709,10 @@ def get_url_resp(url):
logger.log('INFOR', f'Attempting to request {url}')
timeout = settings.request_timeout_second
verify = settings.request_ssl_verify
session = requests.Session()
session.trust_env = False
try:
resp = requests.get(url, params=None, timeout=timeout, verify=verify)
resp = session.get(url, params=None, timeout=timeout, verify=verify)
except Exception as e:
logger.log('ALERT', f'Error request {url}')
logger.log('DEBUG', e.args)