commit: 6f535b6fae878c1fb8520c944156c7dc4b81228d
parent 693415c78707a2bb01bc952bd977292cc67a7f26
Author: potato <mail@crazypotato.tk>
Date: Tue, 4 Mar 2014 19:43:41 +0100
[fix] error when xpath_results in extraxt_text is _ElementUnicodeResult instead of _ElementStringResult
Diffstat:
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/searx/engines/xpath.py b/searx/engines/xpath.py
@@ -1,7 +1,7 @@
from lxml import html
from urllib import urlencode, unquote
from urlparse import urlparse, urljoin
-from lxml.etree import _ElementStringResult
+from lxml.etree import _ElementStringResult, _ElementUnicodeResult
from searx.utils import html_to_text
search_url = None
@@ -29,7 +29,7 @@ def extract_text(xpath_results):
for e in xpath_results:
result = result + extract_text(e)
return result
- elif type(xpath_results) == _ElementStringResult:
+ elif type(xpath_results) in [_ElementStringResult, _ElementUnicodeResult]:
# it's a string
return ''.join(xpath_results)
else: