Merge branch 'master' of https://github.com/asciimoo/searx into boilerplate

searx/engines/framalibre.py

@@ -10,7 +10,10 @@
  @parse       url, title, content, thumbnail, img_src
 """
 
+try:
     from cgi import escape
+except:
+    from html import escape
 from lxml import html
 from searx.engines.xpath import extract_text
 from searx.url_utils import urljoin, urlencode

searx/settings.yml

@@ -744,7 +744,7 @@ engines:
     title_xpath : ./h2
     content_xpath : ./p[@class="s"]
     suggestion_xpath : /html/body//div[@class="top-info"]/p[@class="top-info spell"]/a
-    first_page_num : 1
+    first_page_num : 0
     page_size : 10
     disabled : True
 

searx/webapp.py

@@ -41,7 +41,10 @@ except:
     logger.critical("cannot import dependency: pygments")
     from sys import exit
     exit(1)
+try:
     from cgi import escape
+except:
+    from html import escape
 from datetime import datetime, timedelta
 from time import time
 from werkzeug.contrib.fixers import ProxyFix