wok-current diff 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 (5 months ago)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/hplip/stuff/hplip.is_alive.diff	Thu Apr 04 08:53:51 2024 +0000
     1.3 @@ -0,0 +1,94 @@
     1.4 +diff --git a/copier/copier.py b/copier/copier.py
     1.5 +index a595baa..7794f48 100644
     1.6 +--- a/copier/copier.py
     1.7 ++++ b/copier/copier.py
     1.8 +@@ -73,13 +73,13 @@ class PMLCopyDevice(device.Device):
     1.9 + 
    1.10 +     def isCopyActive(self):
    1.11 +         if self.copy_thread is not None:
    1.12 +-            return self.copy_thread.isAlive()
    1.13 ++            return self.copy_thread.is_alive()
    1.14 +         else:
    1.15 +             return False
    1.16 + 
    1.17 +     def waitForCopyThread(self):
    1.18 +         if self.copy_thread is not None and \
    1.19 +-            self.copy_thread.isAlive():
    1.20 ++            self.copy_thread.is_alive():
    1.21 + 
    1.22 +             self.copy_thread.join()
    1.23 + 
    1.24 +diff --git a/fax/fax.py b/fax/fax.py
    1.25 +index 3d69226..0878a64 100644
    1.26 +--- a/fax/fax.py
    1.27 ++++ b/fax/fax.py
    1.28 +@@ -478,13 +478,13 @@ class FaxDevice(device.Device):
    1.29 + 
    1.30 +     def isSendFaxActive(self):
    1.31 +         if self.send_fax_thread is not None:
    1.32 +-            return self.send_fax_thread.isAlive()
    1.33 ++            return self.send_fax_thread.is_alive()
    1.34 +         else:
    1.35 +             return False
    1.36 + 
    1.37 +     def waitForSendFaxThread(self):
    1.38 +         if self.send_fax_thread is not None and \
    1.39 +-            self.send_fax_thread.isAlive():
    1.40 ++            self.send_fax_thread.is_alive():
    1.41 + 
    1.42 +             try:
    1.43 +                 self.send_fax_thread.join()
    1.44 +diff --git a/fax/pmlfax.py b/fax/pmlfax.py
    1.45 +index b68ff6a..b1020d0 100644
    1.46 +--- a/fax/pmlfax.py
    1.47 ++++ b/fax/pmlfax.py
    1.48 +@@ -179,13 +179,13 @@ class PMLFaxDevice(FaxDevice):
    1.49 + 
    1.50 +     def isUploadLogActive(self):
    1.51 +         if self.upload_log_thread is not None:
    1.52 +-            return self.upload_log_thread.isAlive()
    1.53 ++            return self.upload_log_thread.is_alive()
    1.54 +         else:
    1.55 +             return False
    1.56 + 
    1.57 +     def waitForUploadLogThread(self):
    1.58 +         if self.upload_log_thread is not None and \
    1.59 +-            self.upload_log_thread.isAlive():
    1.60 ++            self.upload_log_thread.is_alive():
    1.61 + 
    1.62 +             self.upload_log_thread.join()
    1.63 + 
    1.64 +diff --git a/scan/sane.py b/scan/sane.py
    1.65 +index b6c4acd..e8f8db8 100755
    1.66 +--- a/scan/sane.py
    1.67 ++++ b/scan/sane.py
    1.68 +@@ -378,14 +378,14 @@ class ScanDevice:
    1.69 + 
    1.70 +     def isScanActive(self):
    1.71 +         if self.scan_thread is not None:
    1.72 +-            return self.scan_thread.isAlive() and self.scan_thread.scan_active
    1.73 ++            return self.scan_thread.is_alive() and self.scan_thread.scan_active
    1.74 +         else:
    1.75 +             return False
    1.76 + 
    1.77 + 
    1.78 +     def waitForScanDone(self):
    1.79 +         if self.scan_thread is not None and \
    1.80 +-            self.scan_thread.isAlive() and \
    1.81 ++            self.scan_thread.is_alive() and \
    1.82 +             self.scan_thread.scan_active:
    1.83 + 
    1.84 +             try:
    1.85 +@@ -398,9 +398,9 @@ class ScanDevice:
    1.86 +         #time.sleep(0.5)
    1.87 +         if self.scan_thread is not None:
    1.88 +             while True:
    1.89 +-                #print self.scan_thread.isAlive()
    1.90 ++                #print self.scan_thread.is_alive()
    1.91 +                 #print self.scan_thread.scan_active
    1.92 +-                if self.scan_thread.isAlive() and \
    1.93 ++                if self.scan_thread.is_alive() and \
    1.94 +                     self.scan_thread.scan_active:
    1.95 +                     return
    1.96 + 
    1.97 +