searx

commit: 7fba3d117986d9b928887044ff303bb156aa6899
parent 4a1ff56389d6ad560594ba82b448aef1d70bbbf4
Author: marc <a01200356@itesm.mx>
Date:   Fri, 16 Dec 2016 22:14:36 -0600

Merge branch 'master' into languages

Diffstat:
M
searx/engines/searchcode_code.py
5
-----
M
searx/engines/searchcode_doc.py
5
-----
M
searx/search.py
2
+-

3 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/searx/engines/searchcode_code.py b/searx/engines/searchcode_code.py
@@ -34,11 +34,6 @@ def request(query, params):
     params['url'] = search_url.format(query=urlencode({'q': query}),
                                       pageno=params['pageno'] - 1)
 
-    # Disable SSL verification
-    # error: (60) SSL certificate problem: unable to get local issuer
-    # certificate
-    params['verify'] = False
-
     return params
 
 
diff --git a/searx/engines/searchcode_doc.py b/searx/engines/searchcode_doc.py
@@ -27,11 +27,6 @@ def request(query, params):
     params['url'] = search_url.format(query=urlencode({'q': query}),
                                       pageno=params['pageno'] - 1)
 
-    # Disable SSL verification
-    # error: (60) SSL certificate problem: unable to get local issuer
-    # certificate
-    params['verify'] = False
-
     return params
 
 
diff --git a/searx/search.py b/searx/search.py
@@ -262,7 +262,7 @@ def get_search_query_from_webapp(preferences, form):
         if not load_default_categories:
             if not query_categories:
                 query_categories = list(set(engine['category']
-                                            for engine in engines))
+                                            for engine in query_engines))
         else:
             # if no category is specified for this search,
             # using user-defined default-configuration which