diff options
| author | Raymond Hettinger <python@rcn.com> | 2012-04-23 00:22:48 -0700 |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2012-04-23 00:22:48 -0700 |
| commit | 016878aea6fb1904b8a04c7f56223c90cd8a0522 (patch) | |
| tree | 9a26efef0ab8adaf26e07774f5332401ccef658f /Lib/threading.py | |
| parent | 094c33f0472a3f9c0aed621a736d24760a5c4d60 (diff) | |
| parent | ea17082c25a4835975537373454097b8dd054692 (diff) | |
| download | cpython-git-016878aea6fb1904b8a04c7f56223c90cd8a0522.tar.gz | |
merge
Diffstat (limited to 'Lib/threading.py')
| -rw-r--r-- | Lib/threading.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/threading.py b/Lib/threading.py index ff32dfb41c..22908550e0 100644 --- a/Lib/threading.py +++ b/Lib/threading.py @@ -605,6 +605,10 @@ class Thread(_Verbose): pass def __stop(self): + # DummyThreads delete self.__block, but they have no waiters to + # notify anyway (join() is forbidden on them). + if not hasattr(self, '_Thread__block'): + return self.__block.acquire() self.__stopped = True self.__block.notify_all() |