#25687: merge with 3.5.

2 files changed, 7 insertions, 4 deletions

diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 9647b4b..e076be6 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -680,10 +680,12 @@ Test cases
       Method called immediately after the test method has been called and the
       result recorded.  This is called even if the test method raised an
       exception, so the implementation in subclasses may need to be particularly
-      careful about checking internal state.  Any exception, other than :exc:`AssertionError`
-      or :exc:`SkipTest`, raised by this method will be considered an error rather than a
-      test failure.  This method will only be called if the :meth:`setUp` succeeds,
-      regardless of the outcome of the test method. The default implementation does nothing.
+      careful about checking internal state.  Any exception, other than
+      :exc:`AssertionError` or :exc:`SkipTest`, raised by this method will be
+      considered an additional error rather than a test failure (thus increasing
+      the total number of reported errors). This method will only be called if
+      the :meth:`setUp` succeeds, regardless of the outcome of the test method.
+      The default implementation does nothing.
 
 
    .. method:: setUpClass()
diff --git a/Misc/ACKS b/Misc/ACKS
index a19e113..033f02b 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1092,6 +1092,7 @@ M. Papillon
 Peter Parente
 Alexandre Parenteau
 Dan Parisien
+HyeSoo Park
 William Park
 Claude Paroz
 Heikki Partanen