From 535fff109f5664b8a72710593cdbb5cb1e670546 Mon Sep 17 00:00:00 2001 From: rachmadaniHaryono Date: Sat, 18 May 2019 00:03:49 +0800 Subject: [PATCH 1/3] fix: dev: python3 dict keys jsonify --- searx/webapp.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/searx/webapp.py b/searx/webapp.py index 727259774..8290b6822 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -846,7 +846,7 @@ def clear_cookies(): @app.route('/config') def config(): - return jsonify({'categories': categories.keys(), + return jsonify({'categories': list(categories.keys()), 'engines': [{'name': engine_name, 'categories': engine.categories, 'shortcut': engine.shortcut, @@ -854,7 +854,7 @@ def config(): 'paging': engine.paging, 'language_support': engine.language_support, 'supported_languages': - engine.supported_languages.keys() + list(engine.supported_languages.keys()) if isinstance(engine.supported_languages, dict) else engine.supported_languages, 'safesearch': engine.safesearch, From 9afc1b1e83670d2d921710559b790067dc211899 Mon Sep 17 00:00:00 2001 From: rachmadaniHaryono Date: Sat, 18 May 2019 18:58:05 +0800 Subject: [PATCH 2/3] new: dev: test for config api --- tests/unit/test_webapp.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/unit/test_webapp.py b/tests/unit/test_webapp.py index e6739bfe5..fae1755d6 100644 --- a/tests/unit/test_webapp.py +++ b/tests/unit/test_webapp.py @@ -157,3 +157,9 @@ class ViewsTestCase(SearxTestCase): def test_favicon(self): result = self.app.get('/favicon.ico') self.assertEqual(result.status_code, 200) + + def test_config(self): + result = self.app.get('/config') + self.assertEqual(result.status_code, 200) + json_result = result.get_json() + self.assertTrue(json_result) From db1dfa4a280b8f886f19619ea01c01687937b5ab Mon Sep 17 00:00:00 2001 From: Nicolas Gelot Date: Mon, 17 Jun 2019 22:08:35 +0200 Subject: [PATCH 3/3] Add addr setup via SEARX_BIND_ADDRESS --- searx/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/searx/__init__.py b/searx/__init__.py index 4d7b2a8d3..d32fe0066 100644 --- a/searx/__init__.py +++ b/searx/__init__.py @@ -91,3 +91,5 @@ logger.info('Initialisation done') if 'SEARX_SECRET' in environ: settings['server']['secret_key'] = environ['SEARX_SECRET'] +if 'SEARX_BIND_ADDRESS' in environ: + settings['server']['bind_address'] = environ['SEARX_BIND_ADDRESS']