浏览代码

Merge pull request #395 from gugod/master

btdigg engine: fix text mojibake.
Adam Tauber 9 年前
父节点
当前提交
911ed7987c
共有 2 个文件被更改,包括 5 次插入5 次删除
  1. 1
    1
      searx/engines/btdigg.py
  2. 4
    4
      searx/tests/engines/test_btdigg.py

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

38
 def response(resp):
38
 def response(resp):
39
     results = []
39
     results = []
40
 
40
 
41
-    dom = html.fromstring(resp.text)
41
+    dom = html.fromstring(resp.content)
42
 
42
 
43
     search_res = dom.xpath('//div[@id="search_res"]/table/tr')
43
     search_res = dom.xpath('//div[@id="search_res"]/table/tr')
44
 
44
 

+ 4
- 4
searx/tests/engines/test_btdigg.py 查看文件

22
         self.assertRaises(AttributeError, btdigg.response, '')
22
         self.assertRaises(AttributeError, btdigg.response, '')
23
         self.assertRaises(AttributeError, btdigg.response, '[]')
23
         self.assertRaises(AttributeError, btdigg.response, '[]')
24
 
24
 
25
-        response = mock.Mock(text='<html></html>')
25
+        response = mock.Mock(content='<html></html>')
26
         self.assertEqual(btdigg.response(response), [])
26
         self.assertEqual(btdigg.response(response), [])
27
 
27
 
28
         html = """
28
         html = """
82
             </table>
82
             </table>
83
         </div>
83
         </div>
84
         """
84
         """
85
-        response = mock.Mock(text=html)
85
+        response = mock.Mock(content=html)
86
         results = btdigg.response(response)
86
         results = btdigg.response(response)
87
         self.assertEqual(type(results), list)
87
         self.assertEqual(type(results), list)
88
         self.assertEqual(len(results), 1)
88
         self.assertEqual(len(results), 1)
101
             </table>
101
             </table>
102
         </div>
102
         </div>
103
         """
103
         """
104
-        response = mock.Mock(text=html)
104
+        response = mock.Mock(content=html)
105
         results = btdigg.response(response)
105
         results = btdigg.response(response)
106
         self.assertEqual(type(results), list)
106
         self.assertEqual(type(results), list)
107
         self.assertEqual(len(results), 0)
107
         self.assertEqual(len(results), 0)
367
             </table>
367
             </table>
368
         </div>
368
         </div>
369
         """
369
         """
370
-        response = mock.Mock(text=html)
370
+        response = mock.Mock(content=html)
371
         results = btdigg.response(response)
371
         results = btdigg.response(response)
372
         self.assertEqual(type(results), list)
372
         self.assertEqual(type(results), list)
373
         self.assertEqual(len(results), 5)
373
         self.assertEqual(len(results), 5)