diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-03-22 00:15:53 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-03-22 00:15:53 (GMT) |
| commit | dccc1fcfafd37c6fd94ca766516cb4903b29668e (patch) | |
| tree | c61f70185ef656a1b6d80481d3cc1833ce3925d4 /Lib/unittest/result.py | |
| parent | a6884fc0fdc46b88a006972d8e8e15f39359336e (diff) | |
| download | cpython-dccc1fcfafd37c6fd94ca766516cb4903b29668e.zip cpython-dccc1fcfafd37c6fd94ca766516cb4903b29668e.tar.gz cpython-dccc1fcfafd37c6fd94ca766516cb4903b29668e.tar.bz2 | |
Merged revisions 79263 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79263 | michael.foord | 2010-03-21 19:06:30 -0500 (Sun, 21 Mar 2010) | 1 line
Issue 7815. __unittest in module globals trims frames from reported stacktraces in unittest.
........
Diffstat (limited to 'Lib/unittest/result.py')
| -rw-r--r-- | Lib/unittest/result.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Lib/unittest/result.py b/Lib/unittest/result.py index 746967e..91cf218 100644 --- a/Lib/unittest/result.py +++ b/Lib/unittest/result.py @@ -4,6 +4,8 @@ import traceback from . import util +__unittest = True + class TestResult(object): """Holder for test result information. @@ -98,11 +100,7 @@ class TestResult(object): return ''.join(traceback.format_exception(exctype, value, tb)) def _is_relevant_tb_level(self, tb): - globs = tb.tb_frame.f_globals - is_relevant = '__name__' in globs and \ - globs["__name__"].startswith("unittest") - del globs - return is_relevant + return '__unittest' in tb.tb_frame.f_globals def _count_relevant_tb_levels(self, tb): length = 0 |