diff options
| author | Elias Ojala <git@eliasojala.me> | 2019-03-29 14:41:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-29 14:41:12 +0000 |
| commit | cef77f0d51db75465c0a8f6107e4a5ac9ad9f5ed (patch) | |
| tree | 91b37f304f2ee026e901145841f4c111e15ac869 | |
| parent | 8039a577a8d0501870c12facc9eba372ed4d1570 (diff) | |
| parent | a80a2d05d14290c57c3cfc59d373e597b1c1c4b5 (diff) | |
| download | searxng-cef77f0d51db75465c0a8f6107e4a5ac9ad9f5ed.tar.gz searxng-cef77f0d51db75465c0a8f6107e4a5ac9ad9f5ed.zip | |
Merge branch 'master' into patch-1
| -rw-r--r-- | requirements.txt | 17 | ||||
| -rw-r--r-- | searx/__init__.py | 4 |
2 files changed, 11 insertions, 10 deletions
diff --git a/requirements.txt b/requirements.txt index fd61b8109..b2ae2d453 100644 --- a/requirements.txt +++ b/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 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 |