summaryrefslogtreecommitdiff
path: root/searx/engines
diff options
context:
space:
mode:
Diffstat (limited to 'searx/engines')
-rw-r--r--searx/engines/flickr_noapi.py12
-rw-r--r--searx/engines/yahoo.py2
2 files changed, 5 insertions, 9 deletions
diff --git a/searx/engines/flickr_noapi.py b/searx/engines/flickr_noapi.py
index c8ee34f7a..1cbb3e0a9 100644
--- a/searx/engines/flickr_noapi.py
+++ b/searx/engines/flickr_noapi.py
@@ -117,14 +117,10 @@ def response(resp):
'img_format': img_format,
'template': 'images.html'
}
- try:
- result['author'] = author
- result['title'] = title
- result['content'] = content
- except:
- result['author'] = ''
- result['title'] = ''
- result['content'] = ''
+ result['author'] = author.encode('utf-8', 'ignore').decode('utf-8')
+ result['source'] = source.encode('utf-8', 'ignore').decode('utf-8')
+ result['title'] = title.encode('utf-8', 'ignore').decode('utf-8')
+ result['content'] = content.encode('utf-8', 'ignore').decode('utf-8')
results.append(result)
return results
diff --git a/searx/engines/yahoo.py b/searx/engines/yahoo.py
index 36c1a11f8..a6b4aeb9f 100644
--- a/searx/engines/yahoo.py
+++ b/searx/engines/yahoo.py
@@ -33,7 +33,7 @@ supported_languages_url = 'https://search.yahoo.com/web/advanced'
results_xpath = "//div[contains(concat(' ', normalize-space(@class), ' '), ' Sr ')]"
url_xpath = './/h3/a/@href'
title_xpath = './/h3/a'
-content_xpath = './/div[@class="compText aAbs"]'
+content_xpath = './/div[contains(@class, "compText")]'
suggestion_xpath = "//div[contains(concat(' ', normalize-space(@class), ' '), ' AlsoTry ')]//a"
time_range_dict = {'day': ['1d', 'd'],