[Python-checkins] cpython (merge default -> default): Merge

Sun Dec 18 19:04:30 CET 2011

http://hg.python.org/cpython/rev/99aaa0a4f23b
changeset: 74041:99aaa0a4f23b
parent: 74040:8335e6c084f6
parent: 74039:336805423372
user: Antoine Pitrou <solipsis at pitrou.net>
date: Sun Dec 18 19:00:16 2011 +0100
summary:
 Merge
files:
 Lib/threading.py | 11 ++++-------
 Lib/urllib/request.py | 2 --
 Misc/NEWS | 6 ++++++
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Lib/threading.py b/Lib/threading.py
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -1047,21 +1047,18 @@
 current = current_thread()
 with _active_limbo_lock:
 for thread in _active.values():
+ # Any lock/condition variable may be currently locked or in an
+ # invalid state, so we reinitialize them.
+ thread._reset_internal_locks()
 if thread is current:
 # There is only one active thread. We reset the ident to
 # its new value since it can have changed.
 ident = get_ident()
 thread._ident = ident
- # Any condition variables hanging off of the active thread may
- # be in an invalid state, so we reinitialize them.
- thread._reset_internal_locks()
 new_active[ident] = thread
 else:
 # All the others are already stopped.
- # We don't call _Thread__stop() because it tries to acquire
- # thread._Thread__block which could also have been held while
- # we forked.
- thread._stopped = True
+ thread._stop()
 
 _limbo.clear()
 _active.clear()
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -1762,7 +1762,6 @@
 
 def http_error_default(self, url, fp, errcode, errmsg, headers):
 """Default error handler: close the connection and raise IOError."""
- void = fp.read()
 fp.close()
 raise HTTPError(url, errcode, errmsg, headers, None)
 
@@ -1951,7 +1950,6 @@
 newurl = headers['uri']
 else:
 return
- void = fp.read()
 fp.close()
 
 # In case the server sent a relative URL, join with original:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -419,6 +419,12 @@
 Library
 -------
 
+- Issue #11870: threading: Properly reinitialize threads internal locks and
+ condition variables to avoid deadlocks in child processes.
+
+- Issue #8035: urllib: Fix a bug where the client could remain stuck after a
+ redirection or an error.
+
 - Issue #13560: os.strerror() now uses the current locale encoding instead of
 UTF-8.
 
-- 
Repository URL: http://hg.python.org/cpython
