summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoémi Ványi <kvch@users.noreply.github.com>2019-06-24 23:16:41 +0200
committerGitHub <noreply@github.com>2019-06-24 23:16:41 +0200
commit4c768f9fe6e43936d3f06ad619a45fe07fa8bebf (patch)
tree894b0b320a54d9f55a0c34a35b8229c96df0dc6f
parent48ccc6c39a9872fc0bc4043c0070ba23cf99724b (diff)
parent1e30f19800dc80ed4484b1a10c46afc26089635c (diff)
Merge pull request #1590 from rachmadaniHaryono/feature/fix-config
fix: dev: python3 dict keys jsonify
-rw-r--r--searx/webapp.py4
-rw-r--r--tests/unit/test_webapp.py6
2 files changed, 8 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,
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)