瀏覽代碼

Merge pull request #303 from dalf/patch-1

Revert of #195 when the search language is not english
Adam Tauber 10 年之前
父節點
當前提交
01de1c6f78
共有 2 個檔案被更改,包括 4 行新增2 行删除
  1. 2
    1
      searx/engines/google.py
  2. 2
    1
      searx/tests/engines/test_google.py

+ 2
- 1
searx/engines/google.py 查看文件

76
                                       query=urlencode({'q': query}))
76
                                       query=urlencode({'q': query}))
77
 
77
 
78
     params['headers']['Accept-Language'] = language
78
     params['headers']['Accept-Language'] = language
79
-    params['cookies']['PREF'] = get_google_pref_cookie()
79
+    if language.startswith('en'):
80
+        params['cookies']['PREF'] = get_google_pref_cookie()
80
 
81
 
81
     return params
82
     return params
82
 
83
 

+ 2
- 1
searx/tests/engines/test_google.py 查看文件

17
         self.assertIn('url', params)
17
         self.assertIn('url', params)
18
         self.assertIn(query, params['url'])
18
         self.assertIn(query, params['url'])
19
         self.assertIn('google.com', params['url'])
19
         self.assertIn('google.com', params['url'])
20
-        self.assertIn('PREF', params['cookies'])
20
+        self.assertNotIn('PREF', params['cookies'])
21
         self.assertIn('fr', params['headers']['Accept-Language'])
21
         self.assertIn('fr', params['headers']['Accept-Language'])
22
 
22
 
23
         dicto['language'] = 'all'
23
         dicto['language'] = 'all'
24
         params = google.request(query, dicto)
24
         params = google.request(query, dicto)
25
         self.assertIn('en', params['headers']['Accept-Language'])
25
         self.assertIn('en', params['headers']['Accept-Language'])
26
+        self.assertIn('PREF', params['cookies'])
26
 
27
 
27
     def test_response(self):
28
     def test_response(self):
28
         self.assertRaises(AttributeError, google.response, None)
29
         self.assertRaises(AttributeError, google.response, None)