summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authord-tux <deniswernert@gmail.com>2019-01-14 13:40:57 +0100
committerGitHub <noreply@github.com>2019-01-14 13:40:57 +0100
commitf1814079f0da111c27e795e023f5e1ab644c94a0 (patch)
tree55ce890e9d3edb621511911a6beed2ca8ce00e02
parent329172f66e7ad066f7cdd24db5d414c816ad8a80 (diff)
parent383e3cc554a3704cd8b076aa686f32b8ce78f681 (diff)
downloadsearxng-f1814079f0da111c27e795e023f5e1ab644c94a0.tar.gz
searxng-f1814079f0da111c27e795e023f5e1ab644c94a0.zip
Merge branch 'master' into engines/unsplash
-rw-r--r--searx/engines/wolframalpha_api.py2
-rw-r--r--tests/unit/engines/test_wolframalpha_api.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/searx/engines/wolframalpha_api.py b/searx/engines/wolframalpha_api.py
index 595c6b7de..1c58c4a9b 100644
--- a/searx/engines/wolframalpha_api.py
+++ b/searx/engines/wolframalpha_api.py
@@ -65,7 +65,7 @@ def replace_pua_chars(text):
def response(resp):
results = []
- search_results = etree.XML(resp.text)
+ search_results = etree.XML(resp.content)
# return empty array if there are no results
if search_results.xpath(failure_xpath):
diff --git a/tests/unit/engines/test_wolframalpha_api.py b/tests/unit/engines/test_wolframalpha_api.py
index 30d337645..0433b34aa 100644
--- a/tests/unit/engines/test_wolframalpha_api.py
+++ b/tests/unit/engines/test_wolframalpha_api.py
@@ -35,7 +35,7 @@ class TestWolframAlphaAPIEngine(SearxTestCase):
xml = '''<?xml version='1.0' encoding='UTF-8'?>
<queryresult success='false' error='false' />
'''
- response = mock.Mock(text=xml.encode('utf-8'))
+ response = mock.Mock(content=xml.encode('utf-8'))
self.assertEqual(wolframalpha_api.response(response), [])
# test basic case
@@ -83,7 +83,7 @@ class TestWolframAlphaAPIEngine(SearxTestCase):
</pod>
</queryresult>
"""
- response = mock.Mock(text=xml, request=request)
+ response = mock.Mock(content=xml, request=request)
results = wolframalpha_api.response(response)
self.assertEqual(type(results), list)
self.assertEqual(len(results), 2)
@@ -144,7 +144,7 @@ class TestWolframAlphaAPIEngine(SearxTestCase):
</pod>
</queryresult>
"""
- response = mock.Mock(text=xml, request=request)
+ response = mock.Mock(content=xml, request=request)
results = wolframalpha_api.response(response)
self.assertEqual(type(results), list)
self.assertEqual(len(results), 2)