summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes 'josch' Schauer <josch@debian.org>2020-12-28 05:53:01 +0100
committerJohannes 'josch' Schauer <josch@debian.org>2020-12-28 05:53:01 +0100
commit9c8022f500020e28c9a688bb58c5b7f39a21922b (patch)
treeba1e79c6a4d3ee64c63bc12fbc981cf3cced5b24
parent3da00684c3e31872834de1ca0758e26ece8f64c4 (diff)
add patch from upstream fixing Thread.isAlive() -> Thread.is_alive() (closes: #976322)debian/0.17.0+dfsg1-2
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/0001-Change-isAlive-to-is_alive-as-isAlive-is-unsupported.patch21
-rw-r--r--debian/patches/series1
3 files changed, 29 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index e018a9e..bcefd08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+searx (0.17.0+dfsg1-2) unstable; urgency=medium
+
+ * add patch from upstream fixing Thread.isAlive() -> Thread.is_alive()
+ (closes: #976322)
+
+ -- Johannes 'josch' Schauer <josch@debian.org> Mon, 28 Dec 2020 05:52:26 +0100
+
searx (0.17.0+dfsg1-1) unstable; urgency=medium
* New upstream release
diff --git a/debian/patches/0001-Change-isAlive-to-is_alive-as-isAlive-is-unsupported.patch b/debian/patches/0001-Change-isAlive-to-is_alive-as-isAlive-is-unsupported.patch
new file mode 100644
index 0000000..091f69c
--- /dev/null
+++ b/debian/patches/0001-Change-isAlive-to-is_alive-as-isAlive-is-unsupported.patch
@@ -0,0 +1,21 @@
+From 3b8bd0770bff2486c30012606562e4d90e23d655 Mon Sep 17 00:00:00 2001
+From: asht <amitgoren12@gmail.com>
+Date: Fri, 31 Jul 2020 00:28:54 +0300
+Subject: [PATCH] Change isAlive() to is_alive() as isAlive() is unsupported in
+ newer Python versions
+
+---
+ searx/search.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/searx/search.py
++++ b/searx/search.py
+@@ -234,7 +234,7 @@ def search_multiple_requests(requests, r
+ if th.name == search_id:
+ remaining_time = max(0.0, timeout_limit - (time() - start_time))
+ th.join(remaining_time)
+- if th.isAlive():
++ if th.is_alive():
+ result_container.add_unresponsive_engine(th._engine_name, 'timeout')
+ logger.warning('engine timeout: {0}'.format(th._engine_name))
+
diff --git a/debian/patches/series b/debian/patches/series
index 9dfcba9..f668289 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ settingsyml
setuppy
makefile
encoding
+0001-Change-isAlive-to-is_alive-as-isAlive-is-unsupported.patch