diff options
| author | Neal Norwitz <nnorwitz@gmail.com> | 2002-02-19 03:01:36 (GMT) |
|---|---|---|
| committer | Neal Norwitz <nnorwitz@gmail.com> | 2002-02-19 03:01:36 (GMT) |
| commit | 45bec8c7fc4c7a27a540814419b1bca052ecc3b2 (patch) | |
| tree | 6bc386e05781eb0546485650a996d30d061c8e86 /Lib/threading.py | |
| parent | ba902fda3c8533c8d1dd34fb06e46b2208affd2d (diff) | |
| download | cpython-45bec8c7fc4c7a27a540814419b1bca052ecc3b2.zip cpython-45bec8c7fc4c7a27a540814419b1bca052ecc3b2.tar.gz cpython-45bec8c7fc4c7a27a540814419b1bca052ecc3b2.tar.bz2 | |
SF #515023. Make _DummyThread.join() signature match base class (Thread)
Diffstat (limited to 'Lib/threading.py')
| -rw-r--r-- | Lib/threading.py | 2 |
1 files changed, 1 insertions, 1 deletions
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" |