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

[ronald.oussoren]

http://hg.python.org/cpython/rev/71b182134853
changeset:   68595:71b182134853
parent:      68592:251fe1a3dbba
parent:      68594:02dbfceeee55
user:        Ronald Oussoren <ronaldoussoren at mac.com>
date:        Wed Mar 16 09:44:26 2011 -0400
summary:
  Merge with 3.2

files:
  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/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -75,6 +75,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