searx

commit: e86947d79c0c1b380e718bc06072285e8a6ca8ed
parent: 693415c78707a2bb01bc952bd977292cc67a7f26
Author: Adam Tauber <asciimoo@gmail.com>
Date:   Tue,  4 Mar 2014 19:47:24 +0100

Merge pull request #44 from potato/master

[fix] xpath_results in extract_text
Diffstat:
M
searx/engines/xpath.py
4
++--

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: