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

diff --git a/Lib/threading.py b/Lib/threading.py
index 6543cc36cbe73ef2bee617264b75c0166368053d..9763c629d8d25687dd1afedbdf8ac5b49643de90 100644 (file)
--- 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"