httptools possibilità di utilizzare requess

This commit is contained in:
Alhaziel
2019-12-19 12:36:46 +01:00
parent fe7ebb5f22
commit 810f729bc4
2 changed files with 8 additions and 5 deletions
+7 -1
View File
@@ -395,6 +395,8 @@ def downloadpage(url, **opt):
@type ignore_response_code: bool @type ignore_response_code: bool
@return: Result of the petition @return: Result of the petition
@rtype: HTTPResponse @rtype: HTTPResponse
@param use_requests: Use requests.session()
@type: bool
Parameter Type Description Parameter Type Description
-------------------------------------------------- -------------------------------------------------- ------------ -------------------------------------------------- -------------------------------------------------- ------------
@@ -422,6 +424,9 @@ def downloadpage(url, **opt):
if opt.get('session', False): if opt.get('session', False):
session = opt['session'] # same session to speed up search session = opt['session'] # same session to speed up search
logger.info('same session') logger.info('same session')
elif opt.get('use_requests', False):
from lib import requests
session = requests.session()
else: else:
from lib import cloudscraper from lib import cloudscraper
session = cloudscraper.create_scraper() session = cloudscraper.create_scraper()
@@ -452,7 +457,8 @@ def downloadpage(url, **opt):
file_name = '' file_name = ''
opt['proxy_retries_counter'] += 1 opt['proxy_retries_counter'] += 1
# session.verify = False session.verify = opt.get('verify', True)
if opt.get('cookies', True): if opt.get('cookies', True):
session.cookies = cj session.cookies = cj
session.headers.update(req_headers) session.headers.update(req_headers)
+1 -4
View File
@@ -163,9 +163,7 @@ class CloudScraper(Session):
def request(self, method, url, *args, **kwargs): def request(self, method, url, *args, **kwargs):
# pylint: disable=E0203 # pylint: disable=E0203
from time import time
from platformcode import logger
start= time()
if kwargs.get('proxies') and kwargs.get('proxies') != self.proxies: if kwargs.get('proxies') and kwargs.get('proxies') != self.proxies:
self.proxies = kwargs.get('proxies') self.proxies = kwargs.get('proxies')
@@ -200,7 +198,6 @@ class CloudScraper(Session):
else: else:
if not resp.is_redirect and resp.status_code not in [429, 503]: if not resp.is_redirect and resp.status_code not in [429, 503]:
self._solveDepthCnt = 0 self._solveDepthCnt = 0
logger.debug('CF TIME= '+str(time()-start))
return resp return resp
# ------------------------------------------------------------------------------- # # ------------------------------------------------------------------------------- #