From: Xiang Zhang <angwerzx@126.com>
Date: Mon, 27 Feb 2017 03:46:37 +0000 (+0800)
Subject: bpo-29376: Fix assertion error in threading._DummyThread.is_alive() (GH-329)
X-Git-Tag: v3.5.4rc1~319
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8400ae209b5fa3d3bdc39d3876eef13d1ea9a72a;p=python

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

diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index b63050982a..83a99023d7 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 06b7b9b4fa..c40d3307b2 100644
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -1215,6 +1215,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 8a7e1b5cd9..635f413dc7 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -32,6 +32,8 @@ Extension Modules
 Library
 -------
 
+- bpo-29376: Fix assertion error in threading._DummyThread.is_alive().
+
 - bpo-29110: Fix file object leak in aifc.open() when file is given as a
   filesystem path and is not in valid AIFF format. Patch by Anthony Zhang.