From 810f729bc4bfc9cbd5f9cbe14074003f27e2fa49 Mon Sep 17 00:00:00 2001 From: Alhaziel Date: Thu, 19 Dec 2019 12:36:46 +0100 Subject: [PATCH] =?UTF-8?q?httptools=20possibilit=C3=A0=20di=20utilizzare?= =?UTF-8?q?=20requess?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/httptools.py | 8 +++++++- lib/cloudscraper/__init__.py | 5 +---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/core/httptools.py b/core/httptools.py index 979109a4..136cc946 100755 --- a/core/httptools.py +++ b/core/httptools.py @@ -395,6 +395,8 @@ def downloadpage(url, **opt): @type ignore_response_code: bool @return: Result of the petition @rtype: HTTPResponse + @param use_requests: Use requests.session() + @type: bool Parameter Type Description -------------------------------------------------- -------------------------------------------------- ------------ @@ -422,6 +424,9 @@ def downloadpage(url, **opt): if opt.get('session', False): session = opt['session'] # same session to speed up search logger.info('same session') + elif opt.get('use_requests', False): + from lib import requests + session = requests.session() else: from lib import cloudscraper session = cloudscraper.create_scraper() @@ -452,7 +457,8 @@ def downloadpage(url, **opt): file_name = '' opt['proxy_retries_counter'] += 1 - # session.verify = False + session.verify = opt.get('verify', True) + if opt.get('cookies', True): session.cookies = cj session.headers.update(req_headers) diff --git a/lib/cloudscraper/__init__.py b/lib/cloudscraper/__init__.py index 0ef9890e..541b32cf 100644 --- a/lib/cloudscraper/__init__.py +++ b/lib/cloudscraper/__init__.py @@ -163,9 +163,7 @@ class CloudScraper(Session): def request(self, method, url, *args, **kwargs): # pylint: disable=E0203 - from time import time - from platformcode import logger - start= time() + if kwargs.get('proxies') and kwargs.get('proxies') != self.proxies: self.proxies = kwargs.get('proxies') @@ -200,7 +198,6 @@ class CloudScraper(Session): else: if not resp.is_redirect and resp.status_code not in [429, 503]: self._solveDepthCnt = 0 - logger.debug('CF TIME= '+str(time()-start)) return resp # ------------------------------------------------------------------------------- #