Merge branch 'stable'

.gitignore

@@ -4,6 +4,7 @@
 *.swp
 
 .dir-locals.el
+.cache/
 .mypy_cache/
 .ropeproject/
 TAGS

CHANGES

@@ -79,6 +79,8 @@ Bugs fixed
 * #3294: ``add_latex_package()`` make crashes non-LaTeX builders
 * The caption of table are rendered as invalid HTML (refs: #3287)
 * #3268: Sphinx crashes with requests package from Debian jessie
+* #3284: Sphinx crashes on parallel build with an extension which raises
+  unserializable exception
 
 
 Release 1.5.1 (released Dec 13, 2016)

Makefile

@@ -61,6 +61,7 @@ clean-generated:
 clean-testfiles:
 	rm -rf tests/build
 	rm -rf .tox/
+	rm -rf .cache/
 
 clean-buildfiles:
 	rm -rf build

sphinx/errors.py

@@ -71,10 +71,9 @@ class SphinxParallelError(SphinxError):
 
     category = 'Sphinx parallel build error'
 
-    def __init__(self, orig_exc, traceback):
-        self.orig_exc = orig_exc
+    def __init__(self, message, traceback):
+        self.message = message
         self.traceback = traceback
 
     def __str__(self):
-        return traceback.format_exception_only(
-            self.orig_exc.__class__, self.orig_exc)[0].strip()
+        return self.message

sphinx/ext/intersphinx.py

@@ -244,8 +244,8 @@ def fetch_inventory(app, uri, inv):
             try:
                 join = localuri and path.join or posixpath.join
                 invdata = read_inventory(f, uri, join)
-            except ValueError:
-                raise ValueError('unknown or unsupported inventory version')
+            except ValueError as exc:
+                raise ValueError('unknown or unsupported inventory version: %r' % exc)
     except Exception as err:
         logger.warning('intersphinx inventory %r not readable due to %s: %s',
                        inv, err.__class__.__name__, err)

sphinx/util/parallel.py

@@ -88,7 +88,8 @@ class ParallelTasks(object):
             failed = False
         except BaseException as err:
             failed = True
-            ret = (err, traceback.format_exc())
+            errmsg = traceback.format_exception_only(err.__class__, err)[0].strip()
+            ret = (errmsg, traceback.format_exc())
         logging.convert_serializable(collector.logs)
         pipe.send((failed, collector.logs, ret))