Merge branch 'master' into languages
commit7fba3d117986d9b928887044ff303bb156aa6899
authormarc <a01200356@itesm.mx>
dateFri 16 Dec 2016, 22:14 (10 years ago)
parent4a1ff5619cd2bf
searx/engines/searchcode_code.py−5
@@ -34,11 +34,6 @@ def request(query, params):
3434 params['url'] = search_url.format(query=urlencode({'q': query}),
3535 pageno=params['pageno'] - 1)
3636
37− # Disable SSL verification
38− # error: (60) SSL certificate problem: unable to get local issuer
39− # certificate
40− params['verify'] = False
41−
4237 return params
4338
4439
searx/engines/searchcode_doc.py−5
@@ -27,11 +27,6 @@ def request(query, params):
2727 params['url'] = search_url.format(query=urlencode({'q': query}),
2828 pageno=params['pageno'] - 1)
2929
30− # Disable SSL verification
31− # error: (60) SSL certificate problem: unable to get local issuer
32− # certificate
33− params['verify'] = False
34−
3530 return params
3631
3732
searx/search.py+1−1
@@ -262,7 +262,7 @@ def get_search_query_from_webapp(preferences, form):
262262 if not load_default_categories:
263263 if not query_categories:
264264 query_categories = list(set(engine['category']
265− for engine in engines))
265+ for engine in query_engines))
266266 else:
267267 # if no category is specified for this search,
268268 # using user-defined default-configuration which