summaryrefslogtreecommitdiff
path: root/Lib/threading.py
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/threading.py')
-rw-r--r--Lib/threading.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/threading.py b/Lib/threading.py
index 6543cc36cb..9763c629d8 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"