From 0970905f99a9a14563dc6b1a7b5d9f4936af2f08 Mon Sep 17 00:00:00 2001 From: Neal Norwitz Date: Tue, 19 Feb 2002 03:02:33 +0000 Subject: 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 6543cc3..9763c62 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" -- cgit v0.12