Fix AttributeError isAlive (#2092)

* fix: roscore -> AttributeError: 'ProcessMonitor' object has no attribute 'isAlive'

* Fix AttributeError: 'Thread' object has no attribute 'isAlive'

* Update remaining instances of isAlive to is_alive

Keep mock method isAlive to keep backwards compatibility for users who happen to be using the mock object.

Signed-off-by: Jacob Perron <jacob@openrobotics.org>

Co-authored-by: Jacob Perron <jacob@openrobotics.org>

Author: BrutusTT

clients/rospy/src/rospy/core.py

@@ -509,7 +509,7 @@ def _add_shutdown_thread(t):
         # last thread may not get reaped until shutdown, but this is
         # relatively minor
         for other in _shutdown_threads[:]:
-            if not other.isAlive():
+            if not other.is_alive():
                 _shutdown_threads.remove(other)
         _shutdown_threads.append(t)
 
@@ -595,7 +595,7 @@ def signal_shutdown(reason):
         threads = _shutdown_threads[:]
 
     for t in threads:
-        if t.isAlive():
+        if t.is_alive():
             t.join(_TIMEOUT_SHUTDOWN_JOIN)
     del _shutdown_threads[:]
     try:

tools/roslaunch/src/roslaunch/pmon.py

@@ -113,7 +113,7 @@ def shutdown_process_monitor(process_monitor):
         process_monitor.shutdown()
         #logger.debug("shutdown_process_monitor: joining ProcessMonitor")
         process_monitor.join(20.0)
-        if process_monitor.isAlive():
+        if process_monitor.is_alive():
             logger.error("shutdown_process_monitor: ProcessMonitor shutdown failed!")
             return False
         else:

tools/roslaunch/test/unit/test_roslaunch_pmon.py

@@ -54,9 +54,14 @@ def __init__(self):
         self.alive = False
         self.is_shutdown = False
 
+    # The preferred method is 'is_alive'
+    # Keep this method around for backwards compatibility
     def isAlive(self):
         return self.alive
 
+    def is_alive(self):
+        return self.alive
+
     def join(self, *args):
         return
 
@@ -302,9 +307,9 @@ def failer():
 
         # Test with a real process monitor
         pmon = roslaunch.pmon.start_process_monitor()
-        self.assert_(pmon.isAlive())
+        self.assert_(pmon.is_alive())
         self.assert_(roslaunch.pmon.shutdown_process_monitor(pmon))
-        self.failIf(pmon.isAlive())
+        self.failIf(pmon.is_alive())
 
         # fiddle around with some state that would shouldn't be
         roslaunch.pmon._shutting_down = True
@@ -321,13 +326,13 @@ def test_pmon_shutdown(self):
         # pmon_shutdown
         pmon1 = roslaunch.pmon.start_process_monitor()
         pmon2 = roslaunch.pmon.start_process_monitor()
-        self.assert_(pmon1.isAlive())
-        self.assert_(pmon2.isAlive())        
+        self.assert_(pmon1.is_alive())
+        self.assert_(pmon2.is_alive())
 
         roslaunch.pmon.pmon_shutdown()
 
-        self.failIf(pmon1.isAlive())
-        self.failIf(pmon2.isAlive())        
+        self.failIf(pmon1.is_alive())
+        self.failIf(pmon2.is_alive())
 
     def test_add_process_listener(self):
         # coverage test, not a functionality test as that would be much more difficult to simulate