git.iko.soy/searx
on master help sign in
Merge branch 'master' into patch-1
cef77f0Elias Ojala
requirements.txt+9−8
compare with master
unifiedsplit
@@ -1,10 +1,11 @@
1−certifi==2017.11.5
1+certifi==2018.11.29
2+flask-babel==0.12.2
2flask==1.0.2
3flask==1.0.2
3−flask-babel==0.11.2
4+idna==2.8
5+jinja2==2.10
4−lxml==4.2.3
6+lxml==4.3.0
5−idna==2.7
6pygments==2.1.3
7pygments==2.1.3
7−pyopenssl==18.0.0
8+pyopenssl==19.0.0
8−python-dateutil==2.7.3
9+python-dateutil==2.7.5
9−pyyaml==3.13
10+pyyaml==4.2b1
10−requests[socks]==2.19.1
11+requests[socks]==2.21.0
searx/__init__.py+2−2
@@ -22,7 +22,7 @@ from os.path import realpath, dirname, join, abspath, isfile
22from io import open
22from io import open
23from ssl import OPENSSL_VERSION_INFO, OPENSSL_VERSION
23from ssl import OPENSSL_VERSION_INFO, OPENSSL_VERSION
24try:
24try:
25− from yaml import load
25+ from yaml import safe_load
26except:
26except:
27 from sys import exit, stderr
27 from sys import exit, stderr
28 stderr.write('[E] install pyyaml\n')
28 stderr.write('[E] install pyyaml\n')
@@ -52,7 +52,7 @@ if not settings_path:
52
52
53# load settings
53# load settings
54with open(settings_path, 'r', encoding='utf-8') as settings_yaml:
54with open(settings_path, 'r', encoding='utf-8') as settings_yaml:
55− settings = load(settings_yaml)
55+ settings = safe_load(settings_yaml)
56
56
57'''
57'''
58enable debug if
58enable debug if