| commit | 45bec8c7fc4c7a27a540814419b1bca052ecc3b2 | [log] [tgz] |
|---|---|---|
| author | Neal Norwitz <nnorwitz@gmail.com> | Tue Feb 19 03:01:36 2002 +0000 |
| committer | Neal Norwitz <nnorwitz@gmail.com> | Tue Feb 19 03:01:36 2002 +0000 |
| tree | 6bc386e05781eb0546485650a996d30d061c8e86 | |
| parent | ba902fda3c8533c8d1dd34fb06e46b2208affd2d [diff] [blame] |
SF #515023. Make _DummyThread.join() signature match base class (Thread)
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 @@ def _set_daemon(self): return 1 - def join(self): + def join(self, timeout=None): assert 0, "cannot join a dummy thread"