From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 10 Apr 2011 22:22:08 +0000 (+0200)
Subject: Merge from 3.2 (issue #11814, issue #8428)
X-Git-Tag: v3.3.0a1~2627
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=753009a657e1f53878a351d5cd4be1cbbf483cf7;p=python

Merge from 3.2 (issue #11814, issue #8428)
---

753009a657e1f53878a351d5cd4be1cbbf483cf7
diff --cc Misc/NEWS
index 9d6307469c,e0e6bd222a..545307a4af
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -98,12 -53,12 +98,18 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #11814: Fix likely typo in multiprocessing.Pool._terminate().
+ 
+ - Issue #8428: Fix a race condition in multiprocessing.Pool when terminating
+   worker processes: new processes would be spawned while the pool is being
+   shut down.  Patch by Charles-François Natali.
+ 
 +- Issue #2650: re.escape() no longer escapes the '_'.
 +
 +- Issue #11757: select.select() now raises ValueError when a negative timeout
 +  is passed (previously, a select.error with EINVAL would be raised).  Patch
 +  by Charles-François Natali.
 +
  - Issue #7311: fix html.parser to accept non-ASCII attribute values.
  
  - Issue #11605: email.parser.BytesFeedParser was incorrectly converting multipart