#17329: merge with 3.3.

diff --cc Doc/library/unittest.rst
index 92dd8dc3b77f24935a8e6de66a8cba565fe2cdb2,c44ab23b3155268cf63190d5adbaf06ffee52915..766122b0c540ab0640bf914a16a7ed6f949cc890
--- 1/Doc/library/unittest.rst
--- 2/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@@ -1570,9 -1500,7 +1577,9 @@@ Loading and running test
        directory must be specified separately.
  
        If importing a module fails, for example due to a syntax error, then this
 -      will be recorded as a single error and discovery will continue.
 +      will be recorded as a single error and discovery will continue.  If the
-       import failure is due to ``SkipTest`` being raised, it will be recorded
++      import failure is due to :exc:`SkipTest` being raised, it will be recorded
 +      as a skip instead of an error.
  
        If a test package name (directory with :file:`__init__.py`) matches the
        pattern then the package will be checked for a ``load_tests``
@@@ -1591,15 -1519,6 +1598,15 @@@
  
        .. versionadded:: 3.2
  
-          Modules that raise ``SkipTest`` on import are recorded as skips, not
-          errors.
 +      .. versionchanged:: 3.4
++         Modules that raise :exc:`SkipTest` on import are recorded as skips,
++         not errors.
 +
 +      .. versionchanged:: 3.4
 +         Paths are sorted before being imported to ensure execution order for a
 +         given test suite is the same even if the underlying file system's ordering
 +         is not dependent on file name like in ext3/4.
 +
  
     The following attributes of a :class:`TestLoader` can be configured either by
     subclassing or assignment on an instance:

diff --cc Lib/unittest/case.py
Simple merge