[rqd] Replace isAlive with is_alive. (#1052)

AcademySoftwareFoundation · Oct 22, 2021 · fc0b509 · fc0b509
1 parent 4b156af
commit fc0b509
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/rqd/rqd/rqcore.py b/rqd/rqd/rqcore.py
@@ -303,7 +303,7 @@ def runLinux(self):
 
  frameInfo.pid = frameInfo.forkedCommand.pid
 
- if not self.rqCore.updateRssThread.isAlive():
+ if not self.rqCore.updateRssThread.is_alive():
  self.rqCore.updateRssThread = threading.Timer(rqd.rqconstants.RSS_UPDATE_INTERVAL,
  self.rqCore.updateRss)
  self.rqCore.updateRssThread.start()
@@ -356,7 +356,7 @@ def runWindows(self):
 
  frameInfo.pid = frameInfo.forkedCommand.pid
 
- if not self.rqCore.updateRssThread.isAlive():
+ if not self.rqCore.updateRssThread.is_alive():
  self.rqCore.updateRssThread = threading.Timer(rqd.rqconstants.RSS_UPDATE_INTERVAL,
  self.rqCore.updateRss)
  self.rqCore.updateRssThread.start()
@@ -404,7 +404,7 @@ def runDarwin(self):
 
  frameInfo.pid = frameInfo.forkedCommand.pid
 
- if not self.rqCore.updateRssThread.isAlive():
+ if not self.rqCore.updateRssThread.is_alive():
  self.rqCore.updateRssThread = threading.Timer(rqd.rqconstants.RSS_UPDATE_INTERVAL,
  self.rqCore.updateRss)
  self.rqCore.updateRssThread.start()

diff --git a/rqd/rqd/rqnetwork.py b/rqd/rqd/rqnetwork.py
@@ -105,9 +105,9 @@ def kill(self, message=""):
  if self.frameAttendantThread is None:
  log.warning(
  "Kill requested before frameAttendantThread is created for: %s", self.frameId)
- elif self.frameAttendantThread.isAlive() and self.pid is None:
+ elif self.frameAttendantThread.is_alive() and self.pid is None:
  log.warning("Kill requested before pid is available for: %s", self.frameId)
- elif self.frameAttendantThread.isAlive():
+ elif self.frameAttendantThread.is_alive():
  # pylint: disable=broad-except
  try:
  if not self.killMessage and message:

diff --git a/rqd/tests/rqcore_tests.py b/rqd/tests/rqcore_tests.py
@@ -206,7 +206,7 @@ def test_deleteFrame(self):
 
  def test_killAllFrame(self):
  frameAttendantThread = mock.MagicMock()
- frameAttendantThread.isAlive.return_value = False
+ frameAttendantThread.is_alive.return_value = False
  frame1Id = 'frame1'
  frame2Id = 'frame2'
  frame3Id = 'frame3'
@@ -230,7 +230,7 @@ def test_killAllFrame(self):
 
  def test_killAllFrameIgnoreNimby(self):
  frameAttendantThread = mock.MagicMock()
- frameAttendantThread.isAlive.return_value = False
+ frameAttendantThread.is_alive.return_value = False
  frame1Id = 'frame1'
  frame2Id = 'frame2'
  frame1 = rqd.rqnetwork.RunningFrame(