summaryrefslogtreecommitdiff
path: root/searx/webapp.py
diff options
context:
space:
mode:
authorNoémi Ványi <kvch@users.noreply.github.com>2019-06-30 13:45:09 +0200
committerGitHub <noreply@github.com>2019-06-30 13:45:09 +0200
commit6c750528749afcfd878347df78ccd45aaf8afcd6 (patch)
tree6d345fd9d6537dc712d2d7b705e62af50e242332 /searx/webapp.py
parent06979fa0829697ed3b0b1946a2ef7b43f308e2c4 (diff)
parent4c768f9fe6e43936d3f06ad619a45fe07fa8bebf (diff)
Merge branch 'master' into ne/improve-infinite-scroll
Diffstat (limited to 'searx/webapp.py')
-rw-r--r--searx/webapp.py4
1 files 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,