diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2013-08-17 13:13:22 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2013-08-17 13:13:22 (GMT) |
| commit | e0c69161bc9d4e9deca4fc0add189b4df9cce8cb (patch) | |
| tree | 577f43f5da23af8cd3f34422599627cef6a2902f /Lib/unittest | |
| parent | 1d8e7dbf1ab5f206016de6ccd9ce3962d264bd9b (diff) | |
| parent | b5bc353b8893461b0ecdf0e4bc2b299ef2b19bc0 (diff) | |
| download | cpython-e0c69161bc9d4e9deca4fc0add189b4df9cce8cb.zip cpython-e0c69161bc9d4e9deca4fc0add189b4df9cce8cb.tar.gz cpython-e0c69161bc9d4e9deca4fc0add189b4df9cce8cb.tar.bz2 | |
#18741: merge with 3.3.
Diffstat (limited to 'Lib/unittest')
| -rw-r--r-- | Lib/unittest/test/test_case.py | 2 | ||||
| -rw-r--r-- | Lib/unittest/test/test_loader.py | 2 | ||||
| -rw-r--r-- | Lib/unittest/test/test_program.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Lib/unittest/test/test_case.py b/Lib/unittest/test/test_case.py index 0d923f0..4987250 100644 --- a/Lib/unittest/test/test_case.py +++ b/Lib/unittest/test/test_case.py @@ -1146,7 +1146,7 @@ test case self.assertWarns(DeprecationWarning, _runtime_warn) def testAssertWarnsContext(self): - # Believe it or not, it is preferrable to duplicate all tests above, + # Believe it or not, it is preferable to duplicate all tests above, # to make sure the __warningregistry__ $@ is circumvented correctly. def _runtime_warn(): warnings.warn("foo", RuntimeWarning) diff --git a/Lib/unittest/test/test_loader.py b/Lib/unittest/test/test_loader.py index e86c09b..f1f8ecd 100644 --- a/Lib/unittest/test/test_loader.py +++ b/Lib/unittest/test/test_loader.py @@ -324,7 +324,7 @@ class Test_TestLoader(unittest.TestCase): # Does loadTestsFromName raise TypeError when the `module` argument # isn't a module object? # - # XXX Accepts the not-a-module object, ignorning the object's type + # XXX Accepts the not-a-module object, ignoring the object's type # This should raise an exception or the method name should be changed # # XXX Some people are relying on this, so keep it for now diff --git a/Lib/unittest/test/test_program.py b/Lib/unittest/test/test_program.py index 97d7a24..151f71e 100644 --- a/Lib/unittest/test/test_program.py +++ b/Lib/unittest/test/test_program.py @@ -365,7 +365,7 @@ class TestCommandLineArgs(unittest.TestCase): self.assertEqual(program.testNames, argv[1:]) # it may be better to use platform specific functions to normalise paths - # rather than accepting '.PY' and '\' as file seprator on Linux / Mac + # rather than accepting '.PY' and '\' as file separator on Linux / Mac # it would also be better to check that a filename is a valid module # identifier (we have a regex for this in loader.py) # for invalid filenames should we raise a useful error rather than |