wok-current view hplip/stuff/hplip.is_alive.diff @ rev 25695
Up linux 5.10.214, Patch xorg-server (CVE-2024-31080, CVE-2024-31081, CVE-2024-31082, CVE-2024-31083)
| author | Stanislas Leduc <shann@slitaz.org> |
|---|---|
| date | Thu Apr 04 08:53:51 2024 +0000 (2 months ago) |
| parents | |
| children |
line source
1 diff --git a/copier/copier.py b/copier/copier.py
2 index a595baa..7794f48 100644
3 --- a/copier/copier.py
4 +++ b/copier/copier.py
5 @@ -73,13 +73,13 @@ class PMLCopyDevice(device.Device):
7 def isCopyActive(self):
8 if self.copy_thread is not None:
9 - return self.copy_thread.isAlive()
10 + return self.copy_thread.is_alive()
11 else:
12 return False
14 def waitForCopyThread(self):
15 if self.copy_thread is not None and \
16 - self.copy_thread.isAlive():
17 + self.copy_thread.is_alive():
19 self.copy_thread.join()
21 diff --git a/fax/fax.py b/fax/fax.py
22 index 3d69226..0878a64 100644
23 --- a/fax/fax.py
24 +++ b/fax/fax.py
25 @@ -478,13 +478,13 @@ class FaxDevice(device.Device):
27 def isSendFaxActive(self):
28 if self.send_fax_thread is not None:
29 - return self.send_fax_thread.isAlive()
30 + return self.send_fax_thread.is_alive()
31 else:
32 return False
34 def waitForSendFaxThread(self):
35 if self.send_fax_thread is not None and \
36 - self.send_fax_thread.isAlive():
37 + self.send_fax_thread.is_alive():
39 try:
40 self.send_fax_thread.join()
41 diff --git a/fax/pmlfax.py b/fax/pmlfax.py
42 index b68ff6a..b1020d0 100644
43 --- a/fax/pmlfax.py
44 +++ b/fax/pmlfax.py
45 @@ -179,13 +179,13 @@ class PMLFaxDevice(FaxDevice):
47 def isUploadLogActive(self):
48 if self.upload_log_thread is not None:
49 - return self.upload_log_thread.isAlive()
50 + return self.upload_log_thread.is_alive()
51 else:
52 return False
54 def waitForUploadLogThread(self):
55 if self.upload_log_thread is not None and \
56 - self.upload_log_thread.isAlive():
57 + self.upload_log_thread.is_alive():
59 self.upload_log_thread.join()
61 diff --git a/scan/sane.py b/scan/sane.py
62 index b6c4acd..e8f8db8 100755
63 --- a/scan/sane.py
64 +++ b/scan/sane.py
65 @@ -378,14 +378,14 @@ class ScanDevice:
67 def isScanActive(self):
68 if self.scan_thread is not None:
69 - return self.scan_thread.isAlive() and self.scan_thread.scan_active
70 + return self.scan_thread.is_alive() and self.scan_thread.scan_active
71 else:
72 return False
75 def waitForScanDone(self):
76 if self.scan_thread is not None and \
77 - self.scan_thread.isAlive() and \
78 + self.scan_thread.is_alive() and \
79 self.scan_thread.scan_active:
81 try:
82 @@ -398,9 +398,9 @@ class ScanDevice:
83 #time.sleep(0.5)
84 if self.scan_thread is not None:
85 while True:
86 - #print self.scan_thread.isAlive()
87 + #print self.scan_thread.is_alive()
88 #print self.scan_thread.scan_active
89 - if self.scan_thread.isAlive() and \
90 + if self.scan_thread.is_alive() and \
91 self.scan_thread.scan_active:
92 return