on master help sign in
Merge pull request #44 from potato/master
e86947dAdam Tauber
searx/engines/xpath.py+2−2
@@ -1,7 +1,7 @@
1from lxml import html
1from lxml import html
2from urllib import urlencode, unquote
2from urllib import urlencode, unquote
3from urlparse import urlparse, urljoin
3from urlparse import urlparse, urljoin
4−from lxml.etree import _ElementStringResult
4+from lxml.etree import _ElementStringResult, _ElementUnicodeResult
5from searx.utils import html_to_text
5from searx.utils import html_to_text
6
6
7search_url = None
7search_url = None
@@ -29,7 +29,7 @@ def extract_text(xpath_results):
29 for e in xpath_results:
29 for e in xpath_results:
30 result = result + extract_text(e)
30 result = result + extract_text(e)
31 return result
31 return result
32− elif type(xpath_results) == _ElementStringResult:
32+ elif type(xpath_results) in [_ElementStringResult, _ElementUnicodeResult]:
33 # it's a string
33 # it's a string
34 return ''.join(xpath_results)
34 return ''.join(xpath_results)
35 else:
35 else: