From b6da6d968079d5902913134ee868564b13808e71 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 13 Dec 2021 20:35:03 +0530 Subject: [PATCH] Another 3.10 deprecation --- src/calibre/gui2/device.py | 3 +-- src/calibre/library/sqlite.py | 3 +-- src/calibre/utils/threadpool.py | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py index 09d9eccc11..b0f82747b6 100644 --- a/src/calibre/gui2/device.py +++ b/src/calibre/gui2/device.py @@ -140,8 +140,7 @@ class DeviceManager(Thread): # {{{ ''' :sleep_time: Time to sleep between device probes in secs ''' - Thread.__init__(self) - self.setDaemon(True) + Thread.__init__(self, daemon=True) # [Device driver, Showing in GUI, Ejected] self.devices = list(device_plugins()) self.disabled_device_plugins = list(disabled_device_plugins()) diff --git a/src/calibre/library/sqlite.py b/src/calibre/library/sqlite.py index 09504736e6..8c7139af1b 100644 --- a/src/calibre/library/sqlite.py +++ b/src/calibre/library/sqlite.py @@ -278,8 +278,7 @@ class DBThread(Thread): CLOSE = '-------close---------' def __init__(self, path, row_factory): - Thread.__init__(self) - self.setDaemon(True) + Thread.__init__(self, daemon=True) self.path = path self.unhandled_error = (None, '') self.row_factory = row_factory diff --git a/src/calibre/utils/threadpool.py b/src/calibre/utils/threadpool.py index e02df84b66..5a0cb79eea 100644 --- a/src/calibre/utils/threadpool.py +++ b/src/calibre/utils/threadpool.py @@ -77,9 +77,8 @@ class WorkerThread(threading.Thread): requestsQueue and resultQueue are instances of queue.Queue passed by the ThreadPool class when it creates a new worker thread. """ - + kwds['daemon'] = True threading.Thread.__init__(self, **kwds) - self.setDaemon(1) self.workRequestQueue = requestsQueue self.resultQueue = resultsQueue self._dismissed = threading.Event()