604f32f · searx · git.iko.soy

git.iko.soy/searx

[fix] bing unicode encode error - fixes #408

commit604f32f67276a34a3ead265ff89d3bb807902b26 authorAdam Tauber <asciimoo@gmail.com> dateFri 28 Aug 2015, 14:51 (11 years ago) parentb9c8039

6 files changed+18−18

compare with master

unifiedsplit

searx/engines/bing.py+1−1 searx/engines/bing_images.py+1−1 searx/engines/bing_news.py+1−1 searx/tests/engines/test_bing.py+4−4 searx/tests/engines/test_bing_images.py+5−5 searx/tests/engines/test_bing_news.py+6−6

searx/engines/bing.py+1−1

@@ -52,7 +52,7 @@ def request(query, params):

5252def response(resp):

5353 results = []

5454

55− dom = html.fromstring(resp.content)

55+ dom = html.fromstring(resp.text)

5656

5757 # parse results

5858 for result in dom.xpath('//div[@class="sa_cc"]'):

searx/engines/bing_images.py+1−1

@@ -63,7 +63,7 @@ def request(query, params):

6363def response(resp):

6464 results = []

6565

66− dom = html.fromstring(resp.content)

66+ dom = html.fromstring(resp.text)

6767

6868 # init regex for yaml-parsing

6969 p = re.compile('({|,)([a-z]+):(")')

searx/engines/bing_news.py+1−1

@@ -68,7 +68,7 @@ def request(query, params):

6868def response(resp):

6969 results = []

7070

71− rss = etree.fromstring(resp.content)

71+ rss = etree.fromstring(resp.text)

7272

7373 ns = rss.nsmap

7474

searx/tests/engines/test_bing.py+4−4

@@ -29,10 +29,10 @@ class TestBingEngine(SearxTestCase):

2929 self.assertRaises(AttributeError, bing.response, '')

3030 self.assertRaises(AttributeError, bing.response, '[]')

3131

32− response = mock.Mock(content='<html></html>')

32+ response = mock.Mock(text='<html></html>')

3333 self.assertEqual(bing.response(response), [])

3434

35− response = mock.Mock(content='<html></html>')

35+ response = mock.Mock(text='<html></html>')

3636 self.assertEqual(bing.response(response), [])

3737

3838 html = """

@@ -54,7 +54,7 @@ class TestBingEngine(SearxTestCase):

5454 </div>

5555 </div>

5656 """

57− response = mock.Mock(content=html)

57+ response = mock.Mock(text=html)

5858 results = bing.response(response)

5959 self.assertEqual(type(results), list)

6060 self.assertEqual(len(results), 1)

@@ -81,7 +81,7 @@ class TestBingEngine(SearxTestCase):

8181 </div>

8282 </li>

8383 """

84− response = mock.Mock(content=html)

84+ response = mock.Mock(text=html)

8585 results = bing.response(response)

8686 self.assertEqual(type(results), list)

8787 self.assertEqual(len(results), 1)

searx/tests/engines/test_bing_images.py+5−5

@@ -31,10 +31,10 @@ class TestBingImagesEngine(SearxTestCase):

3131 self.assertRaises(AttributeError, bing_images.response, '')

3232 self.assertRaises(AttributeError, bing_images.response, '[]')

3333

34− response = mock.Mock(content='<html></html>')

34+ response = mock.Mock(text='<html></html>')

3535 self.assertEqual(bing_images.response(response), [])

3636

37− response = mock.Mock(content='<html></html>')

37+ response = mock.Mock(text='<html></html>')

3838 self.assertEqual(bing_images.response(response), [])

3939

4040 html = """

@@ -52,7 +52,7 @@ oh:"238",tft:"0",oi:"http://www.image.url/Images/Test%2

5252 </div>

5353 """

5454 html = html.replace('\r\n', '').replace('\n', '').replace('\r', '')

55− response = mock.Mock(content=html)

55+ response = mock.Mock(text=html)

5656 results = bing_images.response(response)

5757 self.assertEqual(type(results), list)

5858 self.assertEqual(len(results), 1)

@@ -75,7 +75,7 @@ oh:"238",tft:"0",oi:"http://www.image.url/Images/Test%2

7575 style="height:144px;" width="178" height="144"/>

7676 </a>

7777 """

78− response = mock.Mock(content=html)

78+ response = mock.Mock(text=html)

7979 results = bing_images.response(response)

8080 self.assertEqual(type(results), list)

8181 self.assertEqual(len(results), 0)

@@ -263,7 +263,7 @@ oh:"238",tft:"0",oi:"http://www.image.url/Images/Test%2

263263 </div>

264264 """

265265 html = html.replace('\r\n', '').replace('\n', '').replace('\r', '')

266− response = mock.Mock(content=html)

266+ response = mock.Mock(text=html)

267267 results = bing_images.response(response)

268268 self.assertEqual(type(results), list)

269269 self.assertEqual(len(results), 10)

searx/tests/engines/test_bing_news.py+6−6

@@ -28,10 +28,10 @@ class TestBingNewsEngine(SearxTestCase):

2828 self.assertRaises(AttributeError, bing_news.response, '')

2929 self.assertRaises(AttributeError, bing_news.response, '[]')

3030

31− response = mock.Mock(content='<html></html>')

31+ response = mock.Mock(text='<html></html>')

3232 self.assertEqual(bing_news.response(response), [])

3333

34− response = mock.Mock(content='<html></html>')

34+ response = mock.Mock(text='<html></html>')

3535 self.assertEqual(bing_news.response(response), [])

3636

3737 html = """<?xml version="1.0" encoding="utf-8" ?>

@@ -66,7 +66,7 @@ class TestBingNewsEngine(SearxTestCase):

6666 </item>

6767 </channel>

6868</rss>""" # noqa

69− response = mock.Mock(content=html)

69+ response = mock.Mock(text=html)

7070 results = bing_news.response(response)

7171 self.assertEqual(type(results), list)

7272 self.assertEqual(len(results), 2)

@@ -105,7 +105,7 @@ class TestBingNewsEngine(SearxTestCase):

105105 </item>

106106 </channel>

107107</rss>""" # noqa

108− response = mock.Mock(content=html)

108+ response = mock.Mock(text=html)

109109 results = bing_news.response(response)

110110 self.assertEqual(type(results), list)

111111 self.assertEqual(len(results), 1)

@@ -128,11 +128,11 @@ class TestBingNewsEngine(SearxTestCase):

128128 </channel>

129129</rss>""" # noqa

130130

131− response = mock.Mock(content=html)

131+ response = mock.Mock(text=html)

132132 results = bing_news.response(response)

133133 self.assertEqual(type(results), list)

134134 self.assertEqual(len(results), 0)

135135

136136 html = """<?xml version="1.0" encoding="utf-8" ?>gabarge"""

137− response = mock.Mock(content=html)

137+ response = mock.Mock(text=html)

138138 self.assertRaises(lxml.etree.XMLSyntaxError, bing_news.response, response)