Browse Source

Merge pull request #303 from dalf/patch-1

Revert of #195 when the search language is not english
Adam Tauber 10 years ago
parent
commit
01de1c6f78
2 changed files with 4 additions and 2 deletions
  1. 2
    1
      searx/engines/google.py
  2. 2
    1
      searx/tests/engines/test_google.py

+ 2
- 1
searx/engines/google.py View File

@@ -76,7 +76,8 @@ def request(query, params):
76 76
                                       query=urlencode({'q': query}))
77 77
 
78 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 82
     return params
82 83
 

+ 2
- 1
searx/tests/engines/test_google.py View File

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