summaryrefslogtreecommitdiffstats
path: root/Lib/unittest
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-05-26 06:03:19 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-05-26 06:03:19 (GMT)
commit3e04d5b3068ac67cc01a32b1d5a51ac79c9df5a1 (patch)
tree31de97216c771e456051ddbe31fc338ddf0f8b9f /Lib/unittest
parent4d4bc42c8b2b4b546b36e0c3ecb1e86d57017cee (diff)
parent46f50726a0047ae81d478c3a206f587b8f35ed08 (diff)
downloadcpython-3e04d5b3068ac67cc01a32b1d5a51ac79c9df5a1.zip
cpython-3e04d5b3068ac67cc01a32b1d5a51ac79c9df5a1.tar.gz
cpython-3e04d5b3068ac67cc01a32b1d5a51ac79c9df5a1.tar.bz2
Issue #27076: Merge spelling from 3.5
Diffstat (limited to 'Lib/unittest')
-rw-r--r--Lib/unittest/loader.py2
-rw-r--r--Lib/unittest/result.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/Lib/unittest/loader.py b/Lib/unittest/loader.py
index b254c80..eb447d7 100644
--- a/Lib/unittest/loader.py
+++ b/Lib/unittest/loader.py
@@ -387,7 +387,7 @@ class TestLoader(object):
if tests is not None:
yield tests
if not should_recurse:
- # Either an error occured, or load_tests was used by the
+ # Either an error occurred, or load_tests was used by the
# package.
return
# Handle the contents.
diff --git a/Lib/unittest/result.py b/Lib/unittest/result.py
index a18f11b..c7e3206 100644
--- a/Lib/unittest/result.py
+++ b/Lib/unittest/result.py
@@ -148,7 +148,7 @@ class TestResult(object):
self.skipped.append((test, reason))
def addExpectedFailure(self, test, err):
- """Called when an expected failure/error occured."""
+ """Called when an expected failure/error occurred."""
self.expectedFailures.append(
(test, self._exc_info_to_string(err, test)))