Merge branch 'master' into patch-1

requirements.txt

@@ -1,10 +1,11 @@
-certifi==2017.11.5
+certifi==2018.11.29
+flask-babel==0.12.2
 flask==1.0.2
-flask-babel==0.11.2
-lxml==4.2.3
-idna==2.7
+idna==2.8
+jinja2==2.10
+lxml==4.3.0
 pygments==2.1.3
-pyopenssl==18.0.0
-python-dateutil==2.7.3
-pyyaml==3.13
-requests[socks]==2.19.1
+pyopenssl==19.0.0
+python-dateutil==2.7.5
+pyyaml==4.2b1
+requests[socks]==2.21.0

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