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

[georg.brandl]

https://hg.python.org/cpython/rev/261526da4fc9
changeset:   93209:261526da4fc9
parent:      93207:d30324e2777a
parent:      93208:f5691740ec85
user:        Georg Brandl <georg at python.org>
date:        Tue Oct 28 22:58:30 2014 +0100
summary:
  merge with 3.4

files:
  Doc/library/concurrent.futures.rst |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/Doc/library/concurrent.futures.rst b/Doc/library/concurrent.futures.rst
--- a/Doc/library/concurrent.futures.rst
+++ b/Doc/library/concurrent.futures.rst
@@ -410,6 +410,8 @@
 Exception classes
 -----------------
 
+.. currentmodule:: concurrent.futures.process
+
 .. exception:: BrokenProcessPool
 
    Derived from :exc:`RuntimeError`, this exception class is raised when

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