[Python-checkins] r70605 - python/trunk/Lib/unittest.py

Thu Mar 26 17:32:23 CET 2009

Author: benjamin.peterson
Date: Thu Mar 26 17:32:23 2009
New Revision: 70605
Log:
remove uneeded function
Modified:
 python/trunk/Lib/unittest.py
Modified: python/trunk/Lib/unittest.py
==============================================================================

--- python/trunk/Lib/unittest.py	(original)
+++ python/trunk/Lib/unittest.py	Thu Mar 26 17:32:23 2009
@@ -373,14 +373,14 @@
 result.addSkip(self, str(e))
 return
 except Exception:
- result.addError(self, self._exc_info())
+ result.addError(self, sys.exc_info())
 return
 
 success = False
 try:
 testMethod()
 except self.failureException:
- result.addFailure(self, self._exc_info())
+ result.addFailure(self, sys.exc_info())
 except _ExpectedFailure as e:
 result.addExpectedFailure(self, e.exc_info)
 except _UnexpectedSuccess:
@@ -388,14 +388,14 @@
 except SkipTest as e:
 result.addSkip(self, str(e))
 except Exception:
- result.addError(self, self._exc_info())
+ result.addError(self, sys.exc_info())
 else:
 success = True
 
 try:
 self.tearDown()
 except Exception:
- result.addError(self, self._exc_info())
+ result.addError(self, sys.exc_info())
 success = False
 if success:
 result.addSuccess(self)
@@ -411,13 +411,6 @@
 getattr(self, self._testMethodName)()
 self.tearDown()
 
- def _exc_info(self):
- """Return a version of sys.exc_info() with the traceback frame
- minimised; usually the top level of the traceback frame is not
- needed.
- """
- return sys.exc_info()
-
 def skip(self, reason):
 """Skip this test."""
 raise SkipTest(reason)
