LibreMiami
/
libremiami-search
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #44 from potato/master 

[fix] xpath_results in extract_text
This commit is contained in:
Adam Tauber 2014-03-04 19:47:24 +01:00
parent 693415c787 6f535b6fae
commit e86947d79c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
searx/engines/xpath.py
View File

@ -1,7 +1,7 @@
from lxml import html from lxml import html
from urllib import urlencode, unquote from urllib import urlencode, unquote
from urlparse import urlparse, urljoin from urlparse import urlparse, urljoin
from lxml.etree import _ElementStringResult from lxml.etree import _ElementStringResult, _ElementUnicodeResult
from searx.utils import html_to_text from searx.utils import html_to_text
search_url = None search_url = None
@ -29,7 +29,7 @@ def extract_text(xpath_results):
for e in xpath_results: for e in xpath_results:
result = result + extract_text(e) result = result + extract_text(e)
return result return result
elif type(xpath_results) == _ElementStringResult: elif type(xpath_results) in [_ElementStringResult, _ElementUnicodeResult]:
# it's a string # it's a string
return ''.join(xpath_results) return ''.join(xpath_results)
else: else: