From 82d987b7aab17bba494080f61537fe4888b800b9 Mon Sep 17 00:00:00 2001 From: Johanna England Date: Mon, 4 Mar 2024 13:30:48 +0100 Subject: [PATCH] Fix deprecation warning by using is_set --- python/nav/ipdevpoll/jobs.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/python/nav/ipdevpoll/jobs.py b/python/nav/ipdevpoll/jobs.py index 0f80f8cdaf..be73be8be5 100644 --- a/python/nav/ipdevpoll/jobs.py +++ b/python/nav/ipdevpoll/jobs.py @@ -67,7 +67,6 @@ def __init__(self, msg=None, cause=None, delay=60): class JobHandler(object): - """Handles a single polling job against a single netbox. An instance of this class performs a polling job, as described by @@ -191,7 +190,7 @@ def _get_willing_plugins(self, plugin_classes): else: unwilling_plugins.append(cls) - for (willingness, plugins) in [ + for willingness, plugins in [ ('unwilling', unwilling_plugins), ('willing', willing_plugins), ]: @@ -319,7 +318,7 @@ def log_abort(failure): return failure def save(result): - if self.cancelled.isSet(): + if self.cancelled.is_set(): return wrap_up_job(result) df = self._save_container() @@ -524,7 +523,7 @@ def _container_factory(self, container_class, key, *args, **kwargs): def _raise_if_cancelled(self): """Raises an AbortedJobError if the current job is cancelled""" - if self.cancelled.isSet(): + if self.cancelled.is_set(): raise AbortedJobError("Job was already cancelled") @classmethod