summaryrefslogtreecommitdiffstats
path: root/Lib/unittest/loader.py
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2017-01-18 12:11:12 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2017-01-18 12:11:12 (GMT)
commit4710935b119d24b2cc1ffce37d0f7f8c6a9fceab (patch)
treea8edff9dfb53296987f0e0795d15842bf1f803c9 /Lib/unittest/loader.py
parent043a8bc72a5b6f9b33134e55075504dc0c382c4f (diff)
parent37f183d43d9858c428997430042bdc16ce353850 (diff)
downloadcpython-4710935b119d24b2cc1ffce37d0f7f8c6a9fceab.zip
cpython-4710935b119d24b2cc1ffce37d0f7f8c6a9fceab.tar.gz
cpython-4710935b119d24b2cc1ffce37d0f7f8c6a9fceab.tar.bz2
Issue 29274: Merge doc fixes from 3.5
Diffstat (limited to 'Lib/unittest/loader.py')
-rw-r--r--Lib/unittest/loader.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/unittest/loader.py b/Lib/unittest/loader.py
index eb447d7..e860deb 100644
--- a/Lib/unittest/loader.py
+++ b/Lib/unittest/loader.py
@@ -81,7 +81,7 @@ class TestLoader(object):
self._loading_packages = set()
def loadTestsFromTestCase(self, testCaseClass):
- """Return a suite of all tests cases contained in testCaseClass"""
+ """Return a suite of all test cases contained in testCaseClass"""
if issubclass(testCaseClass, suite.TestSuite):
raise TypeError("Test cases should not be derived from "
"TestSuite. Maybe you meant to derive from "
@@ -95,7 +95,7 @@ class TestLoader(object):
# XXX After Python 3.5, remove backward compatibility hacks for
# use_load_tests deprecation via *args and **kws. See issue 16662.
def loadTestsFromModule(self, module, *args, pattern=None, **kws):
- """Return a suite of all tests cases contained in the given module"""
+ """Return a suite of all test cases contained in the given module"""
# This method used to take an undocumented and unofficial
# use_load_tests argument. For backward compatibility, we still
# accept the argument (which can also be the first position) but we
@@ -135,7 +135,7 @@ class TestLoader(object):
return tests
def loadTestsFromName(self, name, module=None):
- """Return a suite of all tests cases given a string specifier.
+ """Return a suite of all test cases given a string specifier.
The name may resolve either to a module, a test case class, a
test method within a test case class, or a callable object which
@@ -213,7 +213,7 @@ class TestLoader(object):
raise TypeError("don't know how to make test from: %s" % obj)
def loadTestsFromNames(self, names, module=None):
- """Return a suite of all tests cases found using the given sequence
+ """Return a suite of all test cases found using the given sequence
of string specifiers. See 'loadTestsFromName()'.
"""
suites = [self.loadTestsFromName(name, module) for name in names]