d4b6ab2 · searx · git.iko.soy

git.iko.soy/searx

Merge branch 'master' into wolframalpha

commitd4b6ab2be47c7b7ac6ae222905a8848fc428cd69 authora01200356 <a01200356@itesm.mx> dateTue 29 Dec 2015, 16:27 (11 years ago) parente4dd750 01f3e41

3 files changed+16−6

compare with master

unifiedsplit

searx/__init__.py+8 searx/settings.yml+7−5 versions.cfg+1−1

searx/__init__.py+8

@@ -15,9 +15,11 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.

1616'''

1717

18+import certifi

1819import logging

1920from os import environ

2021from os.path import realpath, dirname, join, abspath

22+from ssl import OPENSSL_VERSION_INFO, OPENSSL_VERSION

2123try:

2224 from yaml import load

2325except:

@@ -47,4 +49,10 @@ else:

4749

4850logger = logging.getLogger('searx')

4951

52+# Workaround for openssl versions <1.0.2

53+# https://github.com/certifi/python-certifi/issues/26

54+if OPENSSL_VERSION_INFO[0:3] < (1, 0, 2):

55+ environ['REQUESTS_CA_BUNDLE'] = certifi.old_where()

56+ logger.warning('You are using an old openssl version({0}), please upgrade above 1.0.2!'.format(OPENSSL_VERSION))

57+

5058logger.info('Initialisation done')

searx/settings.yml+7−5

@@ -300,11 +300,13 @@ engines:

300300 engine : vimeo

301301 shortcut : vm

302302

303− - name : wolframalpha

304− shortcut : wa

305− engine : wolframalpha_api

306− api_key: '5952JX-X52L3VKWT8'

307− timeout: 6.0

303+# You can use the engine using the official stable API, but you need an API key

304+# See : http://products.wolframalpha.com/api/

305+# - name : wolframalpha

306+# shortcut : wa

307+# engine : wolframalpha_api

308+# api_key: 'apikey' # required!

309+# timeout: 6.0

308310

309311#The blekko technology and team have joined IBM Watson! -> https://blekko.com/

310312# - name : blekko images

versions.cfg+1−1

@@ -35,7 +35,7 @@ pyopenssl = 0.15.1

3535ndg-httpsclient = 0.4.0

3636pyasn1 = 0.1.8

3737pyasn1-modules = 0.0.6

38−certifi = 2015.04.28

38+certifi = 2015.11.20.1

3939

4040cffi = 1.1.2

4141cryptography = 0.9.1