summaryrefslogtreecommitdiffstats
path: root/Doc/library/unittest.rst
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2017-01-14 09:54:57 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2017-01-14 09:54:57 (GMT)
commit4659ddc433205a4e02e365b9b299221d7ac12113 (patch)
treed1ff48bf6faeda88d32af413d9230220666fa960 /Doc/library/unittest.rst
parent758c7d044bb98da9e98654fa91961f54a915712d (diff)
parent8f1378366e9fc0d7f22fda302f04bf822ae34cc1 (diff)
downloadcpython-4659ddc433205a4e02e365b9b299221d7ac12113.zip
cpython-4659ddc433205a4e02e365b9b299221d7ac12113.tar.gz
cpython-4659ddc433205a4e02e365b9b299221d7ac12113.tar.bz2
Merge doc fixes from 3.5
Diffstat (limited to 'Doc/library/unittest.rst')
-rw-r--r--Doc/library/unittest.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index c13a731..258d3c2 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -1637,11 +1637,11 @@ Loading and running tests
The method optionally resolves *name* relative to the given *module*.
- .. versionchanged:: 3.5
- If an :exc:`ImportError` or :exc:`AttributeError` occurs while traversing
- *name* then a synthetic test that raises that error when run will be
- returned. These errors are included in the errors accumulated by
- self.errors.
+ .. versionchanged:: 3.5
+ If an :exc:`ImportError` or :exc:`AttributeError` occurs while traversing
+ *name* then a synthetic test that raises that error when run will be
+ returned. These errors are included in the errors accumulated by
+ self.errors.
.. method:: loadTestsFromNames(names, module=None)