lzybetter/myAssistant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整requests参数

Browse Source
This commit is contained in:
lzybetter
2023-09-09 16:25:41 +08:00
parent c0f2ac9847
commit a23708900e
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -7,7 +7,7 @@ test.py
*.db *.db
## user file ## user file
token_cache.bin custom_plugins/microsoft_todo/token_cache.bin
### plugin file ### plugin file
custom_plugins/* custom_plugins/*

9
util/requests_with_proxy.py
View File

@@ -32,12 +32,13 @@ class RequestWithProxy:
if self.__no_proxy: if self.__no_proxy:
os.environ['NO_PROXY'] = ','.join(self.__no_proxy) os.environ['NO_PROXY'] = ','.join(self.__no_proxy)
def get(self, url, headers=None): def get(self, url, **kwargs):
try: try:
if url.replace("https://", "").replace("http://", "").splice('/')[0] in self.__no_proxy: if url.replace("https://", "").replace("http://", "").split('/')[0] in self.__no_proxy:
r = requests.get(url=url, headers=headers) r = requests.get(url=url, **kwargs)
else: else:
r = requests.get(url=url, headers=headers, proxies=self.__proxies) kwargs['proxies'] = self.__proxies
r = requests.get(url=url, **kwargs)
return r return r
except: except:
return None return None