(original) (raw)

changeset: 68593:c394f2d42ff8 branch: 3.1 parent: 68590:f2ac5bbc1623 user: Ronald Oussoren ronaldoussoren@mac.com date: Wed Mar 16 09:41:32 2011 -0400 files: Lib/multiprocessing/__init__.py Misc/ACKS Misc/NEWS description: 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. diff -r f2ac5bbc1623 -r c394f2d42ff8 Lib/multiprocessing/__init__.py --- a/Lib/multiprocessing/__init__.py Wed Mar 16 12:48:54 2011 +0200 +++ b/Lib/multiprocessing/__init__.py Wed Mar 16 09:41:32 2011 -0400 @@ -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 -r f2ac5bbc1623 -r c394f2d42ff8 Misc/ACKS --- a/Misc/ACKS Wed Mar 16 12:48:54 2011 +0200 +++ b/Misc/ACKS Wed Mar 16 09:41:32 2011 -0400 @@ -583,6 +583,7 @@ Joe Norton Neal Norwitz Michal Nowikowski +Steffen Daode Nurpmeso Nigel O'Brian Kevin O'Connor Tim O'Malley diff -r f2ac5bbc1623 -r c394f2d42ff8 Misc/NEWS --- a/Misc/NEWS Wed Mar 16 12:48:54 2011 +0200 +++ b/Misc/NEWS Wed Mar 16 09:41:32 2011 -0400 @@ -40,6 +40,10 @@ Library ------- +- 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. /ronaldoussoren@mac.com