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

[terry.reedy]

http://hg.python.org/cpython/rev/90bf8f791ce4
changeset:   90353:90bf8f791ce4
parent:      90350:b1aba042b36c
parent:      90352:9ab66a7f654a
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Tue Apr 15 23:38:44 2014 -0400
summary:
  Merge with 3.4

files:
  Doc/library/unittest.rst |  14 +++++++-------
  Misc/ACKS                |   1 +
  2 files changed, 8 insertions(+), 7 deletions(-)


diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -674,9 +674,9 @@
    .. method:: setUp()
 
       Method called to prepare the test fixture.  This is called immediately
-      before calling the test method; any exception raised by this method will
-      be considered an error rather than a test failure. The default
-      implementation does nothing.
+      before calling the test method; other than :exc:`AssertionError` or :exc:`SkipTest`, 
+      any exception raised by this method will be considered an error rather than 
+      a test failure. The default implementation does nothing.
 
 
    .. method:: tearDown()
@@ -684,10 +684,10 @@
       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 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 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.
 
 
    .. method:: setUpClass()
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -18,6 +18,7 @@
 Marc Abramowitz
 Ron Adam
 Ali Afshar
+Nitika Agarwal
 Jim Ahlstrom
 Farhan Ahmad
 Matthew Ahrens

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