Merge branch 'master' into wolframalpha

Browse Source
This commit is contained in:
a01200356 2015-12-29 16:27:53 -06:00
commit d4b6ab2be4
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
searx/__init__.py
View File

@ -15,9 +15,11 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
(C) 2013- by Adam Tauber, <asciimoo@gmail.com> (C) 2013- by Adam Tauber, <asciimoo@gmail.com>
''' '''
import certifi
import logging import logging
from os import environ from os import environ
from os.path import realpath, dirname, join, abspath from os.path import realpath, dirname, join, abspath
from ssl import OPENSSL_VERSION_INFO, OPENSSL_VERSION
try: try:
from yaml import load from yaml import load
except: except:
@ -47,4 +49,10 @@ else:
logger = logging.getLogger('searx') 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') logger.info('Initialisation done')

12
searx/settings.yml
View File

@ -300,11 +300,13 @@ engines:
engine : vimeo engine : vimeo
shortcut : vm shortcut : vm
- name : wolframalpha # You can use the engine using the official stable API, but you need an API key
shortcut : wa # See : http://products.wolframalpha.com/api/
engine : wolframalpha_api # - name : wolframalpha
api_key: '5952JX-X52L3VKWT8' # shortcut : wa
timeout: 6.0 # engine : wolframalpha_api
# api_key: 'apikey' # required!
# timeout: 6.0
#The blekko technology and team have joined IBM Watson! -> https://blekko.com/ #The blekko technology and team have joined IBM Watson! -> https://blekko.com/
# - name : blekko images # - name : blekko images

2
versions.cfg
View File

@ -35,7 +35,7 @@ pyopenssl = 0.15.1
ndg-httpsclient = 0.4.0 ndg-httpsclient = 0.4.0
pyasn1 = 0.1.8 pyasn1 = 0.1.8
pyasn1-modules = 0.0.6 pyasn1-modules = 0.0.6
certifi = 2015.04.28 certifi = 2015.11.20.1
cffi = 1.1.2 cffi = 1.1.2
cryptography = 0.9.1 cryptography = 0.9.1