From: Xiang Zhang <angwerzx@126.com>
Date: Mon, 27 Feb 2017 03:01:30 +0000 (+0800)
Subject: bpo-29376: Fix assertion error in threading._DummyThread.is_alive() (GH-236)
X-Git-Tag: v3.7.0a1~1267
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f3a9faba4bad91286b78b498547de928078f55da;p=python

bpo-29376: Fix assertion error in threading._DummyThread.is_alive() (GH-236)
---

diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index 2c2914fd6d..6b6c4d220a 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -170,6 +170,9 @@ class ThreadTests(BaseTestCase):
         mutex.acquire()
         self.assertIn(tid, threading._active)
         self.assertIsInstance(threading._active[tid], threading._DummyThread)
+        #Issue 29376
+        self.assertTrue(threading._active[tid].is_alive())
+        self.assertRegex(repr(threading._active[tid]), '_DummyThread')
         del threading._active[tid]
 
     # PyThreadState_SetAsyncExc() is a CPython-only gimmick, not (currently)
diff --git a/Lib/threading.py b/Lib/threading.py
index 4829ff426e..95978d310a 100644
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -1217,6 +1217,10 @@ class _DummyThread(Thread):
     def _stop(self):
         pass
 
+    def is_alive(self):
+        assert not self._is_stopped and self._started.is_set()
+        return True
+
     def join(self, timeout=None):
         assert False, "cannot join a dummy thread"
 
diff --git a/Misc/NEWS b/Misc/NEWS
index 283db49c99..a55112750a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -249,6 +249,8 @@ Extension Modules
 Library
 -------
 
+- bpo-29376: Fix assertion error in threading._DummyThread.is_alive().
+
 - bpo-28624: Add a test that checks that cwd parameter of Popen() accepts
   PathLike objects.  Patch by Sayan Chowdhury.