From: Neal Norwitz <nnorwitz@gmail.com>
Date: Tue, 19 Feb 2002 03:02:33 +0000 (+0000)
Subject: SF #515023.  Make _DummyThread.join() signature match base class (Thread)
X-Git-Tag: v2.2.1c1~202
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0970905f99a9a14563dc6b1a7b5d9f4936af2f08;p=thirdparty%2FPython%2Fcpython.git

SF #515023.  Make _DummyThread.join() signature match base class (Thread)
---

diff --git a/Lib/threading.py b/Lib/threading.py
index 6543cc36cbe7..9763c629d8d2 100644
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -572,7 +572,7 @@ class _DummyThread(Thread):
     def _set_daemon(self):
         return 1
 
-    def join(self):
+    def join(self, timeout=None):
         assert 0, "cannot join a dummy thread"