From a2969f0db1b39b2bb3c1d5db03647788d6b342a3 Mon Sep 17 00:00:00 2001 From: Krytarik Raido Date: Fri, 17 May 2024 01:04:04 +0200 Subject: Fix deprecation warnings on Thread.isSet() --- mini-dinstall | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'mini-dinstall') diff --git a/mini-dinstall b/mini-dinstall index 157e46f..84e8d7f 100755 --- a/mini-dinstall +++ b/mini-dinstall @@ -617,7 +617,7 @@ class IncomingDir(threading.Thread): return bool(inready) def _daemon_event_ispending(self): - return die_event.isSet() or reprocess_needed.isSet() or self._daemon_server_isready() or not self._eventqueue.empty() + return die_event.is_set() or reprocess_needed.is_set() or self._daemon_server_isready() or not self._eventqueue.empty() def _daemon_reprocess_pending(self): curtime = time.time() @@ -659,7 +659,7 @@ class IncomingDir(threading.Thread): self._server.handle_request() self._logger.debug('Checking for DIE event') - if die_event.isSet(): + if die_event.is_set(): self._logger.debug('DIE event caught') break @@ -709,7 +709,7 @@ class IncomingDir(threading.Thread): relname = os.path.basename(os.path.abspath(self._eventqueue.get())) self._logger.debug('Got %s from dnotify' % relname) if not (relname or doing_reprocess): - if reprocess_needed.isSet(): + if reprocess_needed.is_set(): self._logger.info('Got reprocessing event') reprocess_needed.clear() doing_reprocess = True @@ -1250,7 +1250,7 @@ class ArchiveDirIndexer(threading.Thread): self._logger.info('Thread "%s" exiting' % self.name) def _daemon_event_ispending(self): - return die_event.isSet() or not self._eventqueue.empty() + return die_event.is_set() or not self._eventqueue.empty() def _daemonize(self): self._logger.info('Entering daemon mode...') @@ -1266,7 +1266,7 @@ class ArchiveDirIndexer(threading.Thread): while not self._daemon_event_ispending(): time.sleep(1) - if die_event.isSet(): + if die_event.is_set(): break self._logger.debug('Reading from event queue') @@ -1326,7 +1326,7 @@ class ArchiveDirIndexer(threading.Thread): e = threading.Event() self._eventqueue.put(e) self._logger.debug('waiting on reprocess') - while not (e.isSet() or die_event.isSet()): + while not (e.is_set() or die_event.is_set()): time.sleep(0.5) self._logger.debug('done waiting on reprocess') -- cgit v1.2.3