From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Wed, 16 Mar 2011 13:43:06 +0000 (-0400)
Subject: Merge with 3.1
X-Git-Tag: v3.2.1b1~279
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f0edd1b86d1572c0fe9cc31b5aaadc12ea75f7f0;p=python

Merge with 3.1
---

f0edd1b86d1572c0fe9cc31b5aaadc12ea75f7f0
diff --cc Misc/NEWS
index 78442fac2f,d5c4699b68..bd21c5c71c
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -40,9 -40,10 +40,13 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #11133: fix two cases where inspect.getattr_static can trigger code
 +  execution. Patch by Daniel Urban.
 +
+ - Issue #11569: use absolute path to the sysctl command in multiprocessing to
+   ensure that it will be found regardless of the shell PATH. This ensures
+   that multiprocessing.cpu_count works on default installs of MacOSX.
+ 
  - Issue #11501: disutils.archive_utils.make_zipfile no longer fails if zlib is
    not installed. Instead, the zipfile.ZIP_STORED compression is used to create
    the ZipFile. Patch by Natalia B. Bidart.