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

[terry.reedy]

http://hg.python.org/cpython/rev/1b25b2fd2803
changeset:   90356:1b25b2fd2803
parent:      90353:90bf8f791ce4
parent:      90355:a37440dec1b6
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Tue Apr 15 23:44:37 2014 -0400
summary:
  Merge with 3.4

files:
  Doc/library/unittest.rst |  10 +++++-----
  1 files changed, 5 insertions(+), 5 deletions(-)


diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -674,8 +674,8 @@
    .. method:: setUp()
 
       Method called to prepare the test fixture.  This is called immediately
-      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 
+      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.
 
 
@@ -684,9 +684,9 @@
       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, 
+      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.
 
 

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