f2b13a7 · searx · git.iko.soy

[enh] allow default empty values for normal and result proxies

commitf2b13a7de071cd68c9aeef7ff3e87ede88e677e8 authorAdam Tauber <asciimoo@gmail.com> dateWed 19 Jul 2017, 21:33 (9 years ago) parent1794f6a

2 files changed+3−3

unifiedsplit

searx/poolrequests.py+1−1

@@ -75,7 +75,7 @@ class SessionSinglePool(requests.Session):

7575def request(method, url, **kwargs):

7676 """same as requests/requests/api.py request(...) except it use SessionSinglePool and force proxies"""

7777 session = SessionSinglePool()

78− kwargs['proxies'] = settings['outgoing'].get('proxies', None)

78+ kwargs['proxies'] = settings['outgoing'].get('proxies') or None

7979 response = session.request(method=method, url=url, **kwargs)

8080 session.close()

8181 return response

searx/webapp.py+2−2

@@ -142,7 +142,7 @@ _category_names = (gettext('files'),

142142 gettext('map'),

143143 gettext('science'))

144144

145−outgoing_proxies = settings['outgoing'].get('proxies', None)

145+outgoing_proxies = settings['outgoing'].get('proxies') or None

146146

147147

148148@babel.localeselector

@@ -353,7 +353,7 @@ def render(template_name, override_theme=None, **kwargs):

353353

354354 kwargs['image_proxify'] = image_proxify

355355

356− kwargs['proxify'] = proxify if settings.get('result_proxy') else None

356+ kwargs['proxify'] = proxify if settings.get('result_proxy', {}).get('url') else None

357357

358358 kwargs['get_result_template'] = get_result_template

359359