[Python-checkins] cpython (merge 3.1 -> 3.2): Merge with 3.1

Wed Mar 16 14:47:50 CET 2011

http://hg.python.org/cpython/rev/02dbfceeee55
changeset: 68594:02dbfceeee55
branch: 3.2
parent: 68591:6b75ef7cc49e
parent: 68593:c394f2d42ff8
user: Ronald Oussoren <ronaldoussoren at mac.com>
date: Wed Mar 16 09:43:06 2011 -0400
summary:
 Merge with 3.1
files:
 Lib/multiprocessing/__init__.py
 Misc/ACKS
 Misc/NEWS

diff --git a/Lib/multiprocessing/__init__.py b/Lib/multiprocessing/__init__.py
--- a/Lib/multiprocessing/__init__.py
+++ b/Lib/multiprocessing/__init__.py
@@ -115,8 +115,11 @@
 except (ValueError, KeyError):
 num = 0
 elif 'bsd' in sys.platform or sys.platform == 'darwin':
+ comm = '/sbin/sysctl -n hw.ncpu'
+ if sys.platform == 'darwin':
+ comm = '/usr' + comm
 try:
- with os.popen('sysctl -n hw.ncpu') as p:
+ with os.popen(comm) as p:
 num = int(p.read())
 except ValueError:
 num = 0
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -624,6 +624,7 @@
 Joe Norton
 Neal Norwitz
 Michal Nowikowski
+Steffen Daode Nurpmeso
 Nigel O'Brian
 Kevin O'Connor
 Tim O'Malley
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -43,6 +43,10 @@
 - 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.
-- 
Repository URL: http://hg.python.org/cpython
