summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlec Warner <antarus@gentoo.org>2007-03-17 07:24:50 +0000
committerAlec Warner <antarus@gentoo.org>2007-03-17 07:24:50 +0000
commitdc9dc58c652a817121298e80ffb6689547a6aa4a (patch)
treefe0f850a7a1aa095b3ee6be5bb406721651db926
parentbb724721a762121fe73f21d78b9329dc2cc99e65 (diff)
downloadportage-dc9dc58c652a817121298e80ffb6689547a6aa4a.tar.gz
portage-dc9dc58c652a817121298e80ffb6689547a6aa4a.tar.bz2
portage-dc9dc58c652a817121298e80ffb6689547a6aa4a.zip
bump ________foo from the TestCase class since _exc_info() doesn't do anything anyway
svn path=/main/trunk/; revision=6228
-rw-r--r--pym/portage/tests/__init__.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/pym/portage/tests/__init__.py b/pym/portage/tests/__init__.py
index 3eaec03ec..b7640ab2c 100644
--- a/pym/portage/tests/__init__.py
+++ b/pym/portage/tests/__init__.py
@@ -85,9 +85,6 @@ class TestCase(unittest.TestCase):
self._testMethodName = methodName
unittest.TestCase.__init__(self, methodName)
self.todo = False
- # compat hack for older pythons
- if not self._exc_info and self.__exc_info
- self._exc_info = self.__exc_info
def defaultTestResult(self):
return TextTestResult()
@@ -102,7 +99,7 @@ class TestCase(unittest.TestCase):
except KeyboardInterrupt:
raise
except:
- result.addError(self, self._exc_info())
+ result.addError(self, sys.exc_info())
return
ok = False
try:
@@ -112,7 +109,7 @@ class TestCase(unittest.TestCase):
if self.todo:
result.addTodo(self,"%s: TODO" % testMethod)
else:
- result.addFailure(self, self._exc_info())
+ result.addFailure(self, sys.exc_info())
except (KeyboardInterrupt, SystemExit):
raise
except:
@@ -122,7 +119,7 @@ class TestCase(unittest.TestCase):
except KeyboardInterrupt:
raise
except:
- result.addError(self, self._exc_info())
+ result.addError(self, sys.exc_info())
ok = False
if ok: result.addSuccess(self)
finally: