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

[serhiy.storchaka]

https://hg.python.org/cpython/rev/fc36120477ae
changeset:   95765:fc36120477ae
parent:      95764:701b830abbf0
parent:      95758:572dc6bdc0a3
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Wed Apr 22 11:01:38 2015 +0300
summary:
  Merge heads

files:
  Doc/library/compileall.rst  |  4 ++--
  Lib/compileall.py           |  4 +---
  Lib/test/test_compileall.py |  8 ++++----
  Misc/NEWS                   |  3 +++
  4 files changed, 10 insertions(+), 9 deletions(-)


diff --git a/Doc/library/compileall.rst b/Doc/library/compileall.rst
--- a/Doc/library/compileall.rst
+++ b/Doc/library/compileall.rst
@@ -142,8 +142,8 @@
    The argument *workers* specifies how many workers are used to
    compile files in parallel. The default is to not use multiple workers.
    If the platform can't use multiple workers and *workers* argument is given,
-   then a :exc:`NotImplementedError` will be raised.
-   If *workers* is lower than ``0``, a :exc:`ValueError` will be raised.
+   then sequential compilation will be used as a fallback.  If *workers* is
+   lower than ``0``, a :exc:`ValueError` will be raised.
 
    .. versionchanged:: 3.2
       Added the *legacy* and *optimize* parameter.
diff --git a/Lib/compileall.py b/Lib/compileall.py
--- a/Lib/compileall.py
+++ b/Lib/compileall.py
@@ -69,11 +69,9 @@
     files = _walk_dir(dir, quiet=quiet, maxlevels=maxlevels,
                       ddir=ddir)
     success = 1
-    if workers is not None and workers != 1:
+    if workers is not None and workers != 1 and ProcessPoolExecutor is not None:
         if workers < 0:
             raise ValueError('workers must be greater or equal to 0')
-        if ProcessPoolExecutor is None:
-            raise NotImplementedError('multiprocessing support not available')
 
         workers = workers or None
         with ProcessPoolExecutor(max_workers=workers) as executor:
diff --git a/Lib/test/test_compileall.py b/Lib/test/test_compileall.py
--- a/Lib/test/test_compileall.py
+++ b/Lib/test/test_compileall.py
@@ -136,10 +136,10 @@
         self.assertTrue(compile_file_mock.called)
 
     @mock.patch('compileall.ProcessPoolExecutor', new=None)
-    def test_compile_missing_multiprocessing(self):
-        with self.assertRaisesRegex(NotImplementedError,
-                                    "multiprocessing support not available"):
-            compileall.compile_dir(self.directory, quiet=True, workers=5)
+    @mock.patch('compileall.compile_file')
+    def test_compile_missing_multiprocessing(self, compile_file_mock):
+        compileall.compile_dir(self.directory, quiet=True, workers=5)
+        self.assertTrue(compile_file_mock.called)
 
 class EncodingTest(unittest.TestCase):
     """Issue 6716: compileall should escape source code when printing errors
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -15,6 +15,9 @@
 Library
 -------
 
+- Issue #23917: Fall back to sequential compilation when ProcessPoolExecutor
+  doesn't exist.  Patch by Claudiu Popa.
+
 - Issue #23008: Fixed resolving attributes with boolean value is False in pydoc.
 
 - Fix asyncio issue 235: LifoQueue and PriorityQueue's put didn't

-- 
Repository URL: https://hg.python.org/cpython