summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBrett Cannon <bcannon@gmail.com>2005-11-23 02:15:50 (GMT)
committerBrett Cannon <bcannon@gmail.com>2005-11-23 02:15:50 (GMT)
commitad07ff2c77699c49b99140c0e1f36bfcdc9b2e17 (patch)
tree9dff63c51f2b08de5b74b77dae1c24aa85fa2fe5 /Misc
parent5c6e0a1a0cac0b918e2a6ed7573db49cf6d0f6a5 (diff)
downloadcpython-ad07ff2c77699c49b99140c0e1f36bfcdc9b2e17.zip
cpython-ad07ff2c77699c49b99140c0e1f36bfcdc9b2e17.tar.gz
cpython-ad07ff2c77699c49b99140c0e1f36bfcdc9b2e17.tar.bz2
Prevent threading.Thread.join() from blocking when a previous call raised an
exception (e.g., passing in an illegal argument). Applies patch #1314396. Thanks Eric Blossom.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS4
2 files changed, 5 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 72ed346..8eebc05 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -63,6 +63,7 @@ Roy Bixler
Martin Bless
Pablo Bleyer
Erik van Blokland
+Eric Blossom
Finn Bock
Paul Boddie
Matthew Boedicker
diff --git a/Misc/NEWS b/Misc/NEWS
index 9550156..73171f3 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -284,6 +284,10 @@ Extension Modules
Library
-------
+- Patch #1314396: prevent deadlock for threading.Thread.join() when an exception
+ is raised within the method itself on a previous call (e.g., passing in an
+ illegal argument)
+
- Bug #1340337: change time.strptime() to always return ValueError when there
is an error in the format string.