Issue #17914: Use os.cpu_count() instead of multiprocessing.cpu_count() where

cf-natali · cf-natali · commit 37cfb0a920bd · 2013-06-28T19:25:45.000+02:00
applicable.
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
@@ -1664,7 +1664,7 @@ with the :class:`Pool` class.
    callbacks and has a parallel map implementation.
 
    *processes* is the number of worker processes to use.  If *processes* is
-   ``None`` then the number returned by :func:`cpu_count` is used.  If
+   ``None`` then the number returned by :func:`os.cpu_count` is used.  If
    *initializer* is not ``None`` then each worker process will call
    ``initializer(*initargs)`` when it starts.
 
diff --git a/Lib/concurrent/futures/process.py b/Lib/concurrent/futures/process.py
@@ -331,7 +331,7 @@ def __init__(self, max_workers=None):
         _check_system_limits()
 
         if max_workers is None:
-            self._max_workers = multiprocessing.cpu_count()
+            self._max_workers = os.cpu_count() or 1
         else:
             self._max_workers = max_workers
 
diff --git a/Lib/multiprocessing/pool.py b/Lib/multiprocessing/pool.py
@@ -17,10 +17,11 @@
 import queue
 import itertools
 import collections
+import os
 import time
 import traceback
 
-from multiprocessing import Process, cpu_count, TimeoutError
+from multiprocessing import Process, TimeoutError
 from multiprocessing.util import Finalize, debug
 
 #
@@ -147,10 +148,7 @@ def __init__(self, processes=None, initializer=None, initargs=(),
         self._initargs = initargs
 
         if processes is None:
-            try:
-                processes = cpu_count()
-            except NotImplementedError:
-                processes = 1
+            processes = os.cpu_count() or 1
         if processes < 1:
             raise ValueError("Number of processes must be at least 1")
 
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
@@ -508,12 +508,8 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
         elif o in ('-j', '--multiprocess'):
             use_mp = int(a)
             if use_mp <= 0:
-                try:
-                    import multiprocessing
-                    # Use all cores + extras for tests that like to sleep
-                    use_mp = 2 + multiprocessing.cpu_count()
-                except (ImportError, NotImplementedError):
-                    use_mp = 3
+                # Use all cores + extras for tests that like to sleep
+                use_mp = 2 + (os.cpu_count() or 1)
             if use_mp == 1:
                 use_mp = None
         elif o == '--header':
