Fixes for python 3.8

3 files changed, 62 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c67d7d01efb8..d901126dc38e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = searx
 	pkgdesc = A privacy-respecting, hackable metasearch engine (python(3) based)
 	pkgver = 0.15.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://asciimoo.github.io/searx/
 	arch = any
 	license = AGPL
@@ -26,9 +26,11 @@ pkgbase = searx
 	source = https://github.com/asciimoo/searx/archive/v0.15.0.zip
 	source = searx.ini
 	source = searx.sysusers
+	source = 3.8_escape.patch
 	sha512sums = 29b233897b4938b3262b01f7f32a0ff69481ed8934f9e0391571d7da261e4494a5e77f64b683292b5150cc50bb8ba74355c2edc526dd348b2fbd11600cb0592e
 	sha512sums = 6e1e7771e747e2bcb9cbc3e5ec9735461b6d791c0c0412e06e7dd802c18625edd0916de32164bf780c18ef7b6a87f55ed1e917377b3adb2bf53c0344f34b49e8
 	sha512sums = 0f4e134ffb7d36807a0591b92e10d2d74a790aeba50d90dc6bdff634353a1e9ed48c572dcf724483daa9eceb5505dc9b79a1b5a8c28a228b300a01b1eafcdc9f
+	sha512sums = b0d67d7f4af44c492eec48f4068c653c6c087fc4a3cfc7dc9e77a08445494e6c98b610a77a75fec07f7f32f549747061dd12ae4420445ab0755dfe78742a4e72
 
 pkgname = searx
 
diff --git a/3.8_escape.patch b/3.8_escape.patch
new file mode 100644
index 000000000000..635a29bef200
--- /dev/null
+++ b/3.8_escape.patch
@@ -0,0 +1,44 @@
+From 5e5ff0cbf83fc6929545e1ca3f936a162019a2aa Mon Sep 17 00:00:00 2001
+From: lorddavidiii <lorddavidiii@qi0.de>
+Date: Sat, 16 Nov 2019 21:05:08 +0100
+Subject: [PATCH] webapp.py: use html.escape if cgi.escape is not available
+
+- cgi.escape was removed in python 3.8
+- also use html.escape in framalibre.py
+---
+ searx/engines/framalibre.py | 5 ++++-
+ searx/webapp.py             | 5 ++++-
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/searx/engines/framalibre.py b/searx/engines/framalibre.py
+index 146cdaeec..f3441fa5f 100644
+--- a/searx/engines/framalibre.py
++++ b/searx/engines/framalibre.py
+@@ -10,7 +10,10 @@
+  @parse       url, title, content, thumbnail, img_src
+ """
+ 
+-from cgi import escape
++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
+diff --git a/searx/webapp.py b/searx/webapp.py
+index 3bb29140a..183bf1975 100644
+--- a/searx/webapp.py
++++ b/searx/webapp.py
+@@ -41,7 +41,10 @@
+     logger.critical("cannot import dependency: pygments")
+     from sys import exit
+     exit(1)
+-from cgi import escape
++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
diff --git a/PKGBUILD b/PKGBUILD
index 002307244e91..c434bcb892d9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=searx
 pkgver=0.15.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A privacy-respecting, hackable metasearch engine (python(3) based)"
 arch=('any')
 url="https://asciimoo.github.io/searx/"
@@ -27,12 +27,19 @@ replaces=('searx-py3')
 backup=('etc/searx/settings.yml' 'etc/uwsgi/searx.ini')
 source=("https://github.com/asciimoo/searx/archive/v$pkgver.zip"
         'searx.ini'
-        'searx.sysusers')
+        'searx.sysusers'
+        '3.8_escape.patch')
 sha512sums=('29b233897b4938b3262b01f7f32a0ff69481ed8934f9e0391571d7da261e4494a5e77f64b683292b5150cc50bb8ba74355c2edc526dd348b2fbd11600cb0592e'
             '6e1e7771e747e2bcb9cbc3e5ec9735461b6d791c0c0412e06e7dd802c18625edd0916de32164bf780c18ef7b6a87f55ed1e917377b3adb2bf53c0344f34b49e8'
-            '0f4e134ffb7d36807a0591b92e10d2d74a790aeba50d90dc6bdff634353a1e9ed48c572dcf724483daa9eceb5505dc9b79a1b5a8c28a228b300a01b1eafcdc9f')
-
+            '0f4e134ffb7d36807a0591b92e10d2d74a790aeba50d90dc6bdff634353a1e9ed48c572dcf724483daa9eceb5505dc9b79a1b5a8c28a228b300a01b1eafcdc9f'
+            'b0d67d7f4af44c492eec48f4068c653c6c087fc4a3cfc7dc9e77a08445494e6c98b610a77a75fec07f7f32f549747061dd12ae4420445ab0755dfe78742a4e72')
 
+prepare() {
+  cd $srcdir/$pkgname-$pkgver
+  patch -Np1 -i "../3.8_escape.patch"
+}
+            
+            
 package() {
   cd $srcdir/$pkgname-$pkgver
 
@@ -42,13 +49,13 @@ package() {
   # Generate a random secret key
   sed -i -e "s/ultrasecretkey\" # change this!/`openssl rand -hex 32`\"/g" $pkgname/settings.yml
 
-  python3.7 setup.py install --root=$pkgdir --optimize=1
+  python3.8 setup.py install --root=$pkgdir --optimize=1
   
-  mv $pkgdir/usr/lib/python3.7/site-packages/{README.rst,requirements*,tests,searx}
+  mv $pkgdir/usr/lib/python3.8/site-packages/{README.rst,requirements*,tests,searx}
   
   mkdir -p $pkgdir/etc/$pkgname
-  mv $pkgdir/usr/lib/python3.7/site-packages/$pkgname/settings.yml $pkgdir/etc/$pkgname/
-  ln -s /etc/$pkgname/settings.yml $pkgdir/usr/lib/python3.7/site-packages/$pkgname/settings.yml
+  mv $pkgdir/usr/lib/python3.8/site-packages/$pkgname/settings.yml $pkgdir/etc/$pkgname/
+  ln -s /etc/$pkgname/settings.yml $pkgdir/usr/lib/python3.8/site-packages/$pkgname/settings.yml
 
   install -Dm644 "${srcdir}/searx.sysusers" "${pkgdir}/usr/lib/sysusers.d/searx.conf"
   install -Dm644 "${srcdir}/searx.ini" "${pkgdir}/etc/uwsgi/searx.ini"