summaryrefslogtreecommitdiff
path: root/searx
diff options
context:
space:
mode:
authorElias Ojala <git@eliasojala.me>2019-03-29 14:41:12 +0000
committerGitHub <noreply@github.com>2019-03-29 14:41:12 +0000
commitcef77f0d51db75465c0a8f6107e4a5ac9ad9f5ed (patch)
tree91b37f304f2ee026e901145841f4c111e15ac869 /searx
parent8039a577a8d0501870c12facc9eba372ed4d1570 (diff)
parenta80a2d05d14290c57c3cfc59d373e597b1c1c4b5 (diff)
Merge branch 'master' into patch-1
Diffstat (limited to 'searx')
-rw-r--r--searx/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/searx/__init__.py b/searx/__init__.py
index b1010f25f..4d7b2a8d3 100644
--- a/searx/__init__.py
+++ b/searx/__init__.py
@@ -22,7 +22,7 @@ from os.path import realpath, dirname, join, abspath, isfile
from io import open
from ssl import OPENSSL_VERSION_INFO, OPENSSL_VERSION
try:
- from yaml import load
+ from yaml import safe_load
except:
from sys import exit, stderr
stderr.write('[E] install pyyaml\n')
@@ -52,7 +52,7 @@ if not settings_path:
# load settings
with open(settings_path, 'r', encoding='utf-8') as settings_yaml:
- settings = load(settings_yaml)
+ settings = safe_load(settings_yaml)
'''
enable debug if