浏览代码

Merge branch 'master' into languages

marc 8 年前
父节点
当前提交
7fba3d1179
共有 3 个文件被更改,包括 1 次插入11 次删除
  1. 0
    5
      searx/engines/searchcode_code.py
  2. 0
    5
      searx/engines/searchcode_doc.py
  3. 1
    1
      searx/search.py

+ 0
- 5
searx/engines/searchcode_code.py 查看文件

@@ -34,11 +34,6 @@ def request(query, params):
34 34
     params['url'] = search_url.format(query=urlencode({'q': query}),
35 35
                                       pageno=params['pageno'] - 1)
36 36
 
37
-    # Disable SSL verification
38
-    # error: (60) SSL certificate problem: unable to get local issuer
39
-    # certificate
40
-    params['verify'] = False
41
-
42 37
     return params
43 38
 
44 39
 

+ 0
- 5
searx/engines/searchcode_doc.py 查看文件

@@ -27,11 +27,6 @@ def request(query, params):
27 27
     params['url'] = search_url.format(query=urlencode({'q': query}),
28 28
                                       pageno=params['pageno'] - 1)
29 29
 
30
-    # Disable SSL verification
31
-    # error: (60) SSL certificate problem: unable to get local issuer
32
-    # certificate
33
-    params['verify'] = False
34
-
35 30
     return params
36 31
 
37 32
 

+ 1
- 1
searx/search.py 查看文件

@@ -262,7 +262,7 @@ def get_search_query_from_webapp(preferences, form):
262 262
         if not load_default_categories:
263 263
             if not query_categories:
264 264
                 query_categories = list(set(engine['category']
265
-                                            for engine in engines))
265
+                                            for engine in query_engines))
266 266
         else:
267 267
             # if no category is specified for this search,
268 268
             # using user-defined default-configuration which