summaryrefslogtreecommitdiff
path: root/Lib/unittest.py
diff options
context:
space:
mode:
authorMichael Foord <fuzzyman@voidspace.org.uk>2009-05-21 22:57:02 +0000
committerMichael Foord <fuzzyman@voidspace.org.uk>2009-05-21 22:57:02 +0000
commita50af069318213a8e129e9fc02745446517797f0 (patch)
treebbc58e5aabe0aefdb485fa66a7d8c12f1a32cd7b /Lib/unittest.py
parenta4e0efa4b13e9a51faad19be27b18ed02c9a26f0 (diff)
downloadcpython-git-a50af069318213a8e129e9fc02745446517797f0.tar.gz
Rename TestCase._result to _resultForDoCleanups to avoid potential clashes in TestCase subclasses. Issue 6072.
Diffstat (limited to 'Lib/unittest.py')
-rw-r--r--Lib/unittest.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/unittest.py b/Lib/unittest.py
index 5858d89e48..fce70f8010 100644
--- a/Lib/unittest.py
+++ b/Lib/unittest.py
@@ -352,7 +352,7 @@ class TestCase(object):
not have a method with the specified name.
"""
self._testMethodName = methodName
- self._result = None
+ self._resultForDoCleanups = None
try:
testMethod = getattr(self, methodName)
except AttributeError:
@@ -456,7 +456,7 @@ class TestCase(object):
if startTestRun is not None:
startTestRun()
- self._result = result
+ self._resultForDoCleanups = result
result.startTest(self)
testMethod = getattr(self, self._testMethodName)
try:
@@ -503,7 +503,7 @@ class TestCase(object):
def doCleanups(self):
"""Execute all cleanup functions. Normally called for you after
tearDown."""
- result = self._result
+ result = self._resultForDoCleanups
ok = True
while self._cleanups:
function, args, kwargs = self._cleanups.pop(-1)