From 45bec8c7fc4c7a27a540814419b1bca052ecc3b2 Mon Sep 17 00:00:00 2001
From: Neal Norwitz <nnorwitz@gmail.com>
Date: Tue, 19 Feb 2002 03:01:36 +0000
Subject: [PATCH] SF #515023.  Make _DummyThread.join() signature match base
 class (Thread)

---
 Lib/threading.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lib/threading.py b/Lib/threading.py
index 6543cc36cbe..9763c629d8d 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"