From e11de99e9c16f3b610d7f57d1554c8916718ade3 Mon Sep 17 00:00:00 2001 From: Prinz23 Date: Wed, 22 Sep 2021 14:03:32 +0100 Subject: [PATCH] Change deprecated threading methods to properties. --- lib/adba/__init__.py | 2 +- lib/adba/aniDBlink.py | 2 +- sickbeard/logger.py | 2 +- sickbeard/providers/generic.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/adba/__init__.py b/lib/adba/__init__.py index bd8fdd8..dae1a98 100644 --- a/lib/adba/__init__.py +++ b/lib/adba/__init__.py @@ -58,7 +58,7 @@ class Connection(threading.Thread): # thread keep alive stuff self.keepAlive = keepAlive - self.setDaemon(True) + self.daemon = True self.lastKeepAliveCheck = 0 self.lastAuth = 0 self._username = password diff --git a/lib/adba/aniDBlink.py b/lib/adba/aniDBlink.py index af04c9c..dd268d2 100644 --- a/lib/adba/aniDBlink.py +++ b/lib/adba/aniDBlink.py @@ -56,7 +56,7 @@ class AniDBLink(threading.Thread): self.QuitProcessed = False - self.setDaemon(True) + self.daemon = True self.start() def connectSocket(self, myport, timeout): diff --git a/sickbeard/logger.py b/sickbeard/logger.py index 4d26213..4bea420 100644 --- a/sickbeard/logger.py +++ b/sickbeard/logger.py @@ -205,7 +205,7 @@ class SBRotatingLogHandler(object): if not expired: continue - out_line = '%s :: %s' % (threading.current_thread().getName(), to_log) + out_line = '%s :: %s' % (threading.current_thread().name, to_log) sb_logger = logging.getLogger('sickbeard') setattr(sb_logger, 'db', lambda *args: sb_logger.log(DB, *args)) diff --git a/sickbeard/providers/generic.py b/sickbeard/providers/generic.py index a29e3a4..a2f1330 100644 --- a/sickbeard/providers/generic.py +++ b/sickbeard/providers/generic.py @@ -505,7 +505,7 @@ class GenericProvider(object): if time_left > datetime.timedelta(seconds=0): if log_warning: # Ensure provider name output (e.g. when displaying config/provs) instead of e.g. thread "Tornado" - prepend = ('[%s] :: ' % self.name, '')[any([x.name in threading.current_thread().getName() + prepend = ('[%s] :: ' % self.name, '')[any([x.name in threading.current_thread().name for x in sickbeard.providers.sortedProviderList()])] logger.log('%sToo many requests reached at %s, waiting for %s' % ( prepend, self.fmt_delta(self.tmr_limit_time), self.fmt_delta(time_left)), logger.WARNING)