summaryrefslogtreecommitdiff
path: root/searx/poolrequests.py
diff options
context:
space:
mode:
Diffstat (limited to 'searx/poolrequests.py')
-rw-r--r--searx/poolrequests.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/searx/poolrequests.py b/searx/poolrequests.py
index f9a9d7719..51b6219c3 100644
--- a/searx/poolrequests.py
+++ b/searx/poolrequests.py
@@ -20,7 +20,7 @@ class HTTPAdapterWithConnParams(requests.adapters.HTTPAdapter):
self.config = {}
self.proxy_manager = {}
- super(requests.adapters.HTTPAdapter, self).__init__()
+ super().__init__()
self._pool_connections = pool_connections
self._pool_maxsize = pool_maxsize
@@ -60,7 +60,7 @@ else:
class SessionSinglePool(requests.Session):
def __init__(self):
- super(SessionSinglePool, self).__init__()
+ super().__init__()
# reuse the same adapters
with RLock():
@@ -71,7 +71,7 @@ class SessionSinglePool(requests.Session):
def close(self):
"""Call super, but clear adapters since there are managed globaly"""
self.adapters.clear()
- super(SessionSinglePool, self).close()
+ super().close()
def set_timeout_for_thread(timeout, start_time=None):
@@ -95,7 +95,8 @@ def request(method, url, **kwargs):
session = SessionSinglePool()
# proxies
- kwargs['proxies'] = settings['outgoing'].get('proxies') or None
+ if kwargs.get('proxies') is None:
+ kwargs['proxies'] = settings['outgoing'].get('proxies')
# timeout
if 'timeout' in kwargs: