Просмотр исходного кода

[fix] quickfix for sometimes missing PREF cookie

Adam Tauber 9 лет назад
Родитель
Сommit
d8f8bdc951
2 измененных файлов: 5 добавлений и 2 удалений
  1. 4
    1
      searx/engines/google.py
  2. 1
    1
      searx/tests/engines/test_google.py

+ 4
- 1
searx/engines/google.py Просмотреть файл

202
     params['headers']['Accept-Language'] = language
202
     params['headers']['Accept-Language'] = language
203
     params['headers']['Accept'] = 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'
203
     params['headers']['Accept'] = 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'
204
     if google_hostname == default_hostname:
204
     if google_hostname == default_hostname:
205
-        params['cookies']['PREF'] = get_google_pref_cookie()
205
+        try:
206
+            params['cookies']['PREF'] = get_google_pref_cookie()
207
+        except:
208
+            logger.warning('cannot fetch PREF cookie')
206
     params['cookies']['NID'] = get_google_nid_cookie(google_hostname)
209
     params['cookies']['NID'] = get_google_nid_cookie(google_hostname)
207
 
210
 
208
     params['google_hostname'] = google_hostname
211
     params['google_hostname'] = google_hostname

+ 1
- 1
searx/tests/engines/test_google.py Просмотреть файл

31
         params = google.request(query, dicto)
31
         params = google.request(query, dicto)
32
         self.assertIn('google.com', params['url'])
32
         self.assertIn('google.com', params['url'])
33
         self.assertIn('en', params['headers']['Accept-Language'])
33
         self.assertIn('en', params['headers']['Accept-Language'])
34
-        self.assertIn('PREF', params['cookies'])
34
+        # self.assertIn('PREF', params['cookies'])
35
         self.assertIn('NID', params['cookies'])
35
         self.assertIn('NID', params['cookies'])
36
 
36
 
37
     def test_response(self):
37
     def test_response(self):