bacow/AV_Data_Capture
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #361 from Mosney/patch-2

Browse Source 
fix proxy config not work
This commit is contained in:
Yoshiko2
2020-11-30 10:35:32 +08:00
committed by GitHub
parent ac547e878f 180ad74948
commit 467e4d0a86
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ADC_function.py
View File

@@ -50,7 +50,7 @@ def get_html(url, cookies: dict = None, ua: str = None, return_type: str = None)
for i in range(retry_count): for i in range(retry_count):
try: try:
if switch == 1: if switch == '1' or switch == 1:
result = requests.get(str(url), headers=headers, timeout=timeout, proxies=proxies, cookies=cookies) result = requests.get(str(url), headers=headers, timeout=timeout, proxies=proxies, cookies=cookies)
else: else:
result = requests.get(str(url), headers=headers, timeout=timeout, cookies=cookies) result = requests.get(str(url), headers=headers, timeout=timeout, cookies=cookies)
@@ -76,7 +76,7 @@ def post_html(url: str, query: dict) -> requests.Response:
for i in range(retry_count): for i in range(retry_count):
try: try:
if switch == 1: if switch == 1 or switch == '1':
result = requests.post(url, data=query, proxies=proxies,headers=headers, timeout=timeout) result = requests.post(url, data=query, proxies=proxies,headers=headers, timeout=timeout)
else: else:
result = requests.post(url, data=query, headers=headers, timeout=timeout) result = requests.post(url, data=query, headers=headers, timeout=timeout)
@@ -97,7 +97,7 @@ def get_javlib_cookie() -> [dict, str]:
# Get __cfduid/cf_clearance and user-agent # Get __cfduid/cf_clearance and user-agent
for i in range(retry_count): for i in range(retry_count):
try: try:
if switch == 1: if switch == 1 or switch == '1':
raw_cookie, user_agent = cloudscraper.get_cookie_string( raw_cookie, user_agent = cloudscraper.get_cookie_string(
"http://www.m45e.com/", "http://www.m45e.com/",
proxies=proxies proxies=proxies