diff options
| author | a01200356 <a01200356@itesm.mx> | 2015-12-29 16:27:53 -0600 |
|---|---|---|
| committer | a01200356 <a01200356@itesm.mx> | 2015-12-29 16:27:53 -0600 |
| commit | d4b6ab2be47c7b7ac6ae222905a8848fc428cd69 (patch) | |
| tree | 802e46845d87b3191b98f84363bf59b42d4d151b | |
| parent | e4dd75070f09223437ce48f8dfeeafae755613eb (diff) | |
| parent | 01f3e41fec5c4c1e8a80db16f06476bb2fbb322d (diff) | |
Merge branch 'master' into wolframalpha
| -rw-r--r-- | searx/__init__.py | 8 | ||||
| -rw-r--r-- | searx/settings.yml | 12 | ||||
| -rw-r--r-- | versions.cfg | 2 |
3 files changed, 16 insertions, 6 deletions
diff --git a/searx/__init__.py b/searx/__init__.py index ea21e8f13..76038a443 100644 --- a/searx/__init__.py +++ b/searx/__init__.py @@ -15,9 +15,11 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >. (C) 2013- by Adam Tauber, <asciimoo@gmail.com> ''' +import certifi import logging from os import environ from os.path import realpath, dirname, join, abspath +from ssl import OPENSSL_VERSION_INFO, OPENSSL_VERSION try: from yaml import load except: @@ -47,4 +49,10 @@ else: logger = logging.getLogger('searx') +# Workaround for openssl versions <1.0.2 +# https://github.com/certifi/python-certifi/issues/26 +if OPENSSL_VERSION_INFO[0:3] < (1, 0, 2): + environ['REQUESTS_CA_BUNDLE'] = certifi.old_where() + logger.warning('You are using an old openssl version({0}), please upgrade above 1.0.2!'.format(OPENSSL_VERSION)) + logger.info('Initialisation done') diff --git a/searx/settings.yml b/searx/settings.yml index 1c8ba3f7f..e23e4c390 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -300,11 +300,13 @@ engines: engine : vimeo shortcut : vm - - name : wolframalpha - shortcut : wa - engine : wolframalpha_api - api_key: '5952JX-X52L3VKWT8' - timeout: 6.0 +# You can use the engine using the official stable API, but you need an API key +# See : http://products.wolframalpha.com/api/ +# - name : wolframalpha +# shortcut : wa +# engine : wolframalpha_api +# api_key: 'apikey' # required! +# timeout: 6.0 #The blekko technology and team have joined IBM Watson! -> https://blekko.com/ # - name : blekko images diff --git a/versions.cfg b/versions.cfg index 6aad7a744..2cb86aba1 100644 --- a/versions.cfg +++ b/versions.cfg @@ -35,7 +35,7 @@ pyopenssl = 0.15.1 ndg-httpsclient = 0.4.0 pyasn1 = 0.1.8 pyasn1-modules = 0.0.6 -certifi = 2015.04.28 +certifi = 2015.11.20.1 cffi = 1.1.2 cryptography = 0.9.1 |