Skip to content

Commit ed8ebe3

Browse files
committed
Request module readibilty tweakings
1 parent d261c4e commit ed8ebe3

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

core/Request.py

+3-5
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ def __parse_custom_header(self, custom_header):
1717
self.__headers[custom_header_key] = custom_header_value
1818

1919
def __init__(self, url, user_agent, cookies_string=False, custom_header=False, insecure_ssl='false', proxy=False):
20+
urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
2021
self.__url = url
2122
self.__headers = dict()
2223
self.__headers['User-Agent'] = self.__default_user_agent if user_agent == 'default' else user_agent
@@ -25,16 +26,13 @@ def __init__(self, url, user_agent, cookies_string=False, custom_header=False, i
2526
if custom_header:
2627
self.__parse_custom_header(custom_header)
2728
self.__verify = 'CERT_REQUIRED' if insecure_ssl == 'false' else 'CERT_NONE'
28-
if proxy:
29-
self.__proxy = proxy
30-
urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
3129
if proxy:
3230
proxy_type = proxy.split('://')[0]
3331
if proxy_type == 'http' or proxy_type == 'https':
34-
self.__request_obj = urllib3.ProxyManager(self.__proxy, ssl_version=ssl.PROTOCOL_TLSv1,
32+
self.__request_obj = urllib3.ProxyManager(proxy, ssl_version=ssl.PROTOCOL_TLSv1,
3533
timeout=self.__request_timeout, cert_reqs=self.__verify)
3634
else:
37-
self.__request_obj = SOCKSProxyManager(self.__proxy, ssl_version=ssl.PROTOCOL_TLSv1,
35+
self.__request_obj = SOCKSProxyManager(proxy, ssl_version=ssl.PROTOCOL_TLSv1,
3836
timeout=self.__request_timeout, cert_reqs=self.__verify)
3937
else:
4038
self.__request_obj = urllib3.PoolManager(ssl_version=ssl.PROTOCOL_TLSv1, timeout=self.__request_timeout,

0 commit comments

Comments
 (0)