diff options
| author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2016-09-03 15:55:35 (GMT) |
|---|---|---|
| committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2016-09-03 15:55:35 (GMT) |
| commit | 44ac3c5fe9b454b7316465162df8b651f23b9f75 (patch) | |
| tree | 93d4a35adee16d021bc94dedfa7b555d23c1c24e /Lib | |
| parent | d635f2f54feef456bb127f3e72e69e9d0ea59b22 (diff) | |
| parent | 1b8f7b818fdb851b428f5032963ecba310f071e3 (diff) | |
| download | cpython-44ac3c5fe9b454b7316465162df8b651f23b9f75.zip cpython-44ac3c5fe9b454b7316465162df8b651f23b9f75.tar.gz cpython-44ac3c5fe9b454b7316465162df8b651f23b9f75.tar.bz2 | |
Merge upstream change.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_traceback.py | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py index 665abb4..fc7e6cc 100644 --- a/Lib/test/test_traceback.py +++ b/Lib/test/test_traceback.py @@ -325,13 +325,13 @@ class TracebackFormatTests(unittest.TestCase): lineno_f = f.__code__.co_firstlineno result_f = ( 'Traceback (most recent call last):\n' - f' File "{__file__}", line {lineno_f+5}, in _check_recursive_traceback_display\n' + f' File "{__file__}", line {lineno_f+5}, in _check_recursive_traceback_display''\n' ' f()\n' - f' File "{__file__}", line {lineno_f+1}, in f\n' + f' File "{__file__}", line {lineno_f+1}, in f''\n' ' f()\n' - f' File "{__file__}", line {lineno_f+1}, in f\n' + f' File "{__file__}", line {lineno_f+1}, in f''\n' ' f()\n' - f' File "{__file__}", line {lineno_f+1}, in f\n' + f' File "{__file__}", line {lineno_f+1}, in f''\n' ' f()\n' # XXX: The following line changes depending on whether the tests # are run through the interactive interpreter or with -m @@ -370,20 +370,20 @@ class TracebackFormatTests(unittest.TestCase): lineno_g = g.__code__.co_firstlineno result_g = ( - f' File "{__file__}", line {lineno_g+2}, in g\n' + f' File "{__file__}", line {lineno_g+2}, in g''\n' ' return g(count-1)\n' - f' File "{__file__}", line {lineno_g+2}, in g\n' + f' File "{__file__}", line {lineno_g+2}, in g''\n' ' return g(count-1)\n' - f' File "{__file__}", line {lineno_g+2}, in g\n' + f' File "{__file__}", line {lineno_g+2}, in g''\n' ' return g(count-1)\n' ' [Previous line repeated 6 more times]\n' - f' File "{__file__}", line {lineno_g+3}, in g\n' + f' File "{__file__}", line {lineno_g+3}, in g''\n' ' raise ValueError\n' 'ValueError\n' ) tb_line = ( 'Traceback (most recent call last):\n' - f' File "{__file__}", line {lineno_g+7}, in _check_recursive_traceback_display\n' + f' File "{__file__}", line {lineno_g+7}, in _check_recursive_traceback_display''\n' ' g()\n' ) expected = (tb_line + result_g).splitlines() @@ -407,16 +407,16 @@ class TracebackFormatTests(unittest.TestCase): lineno_h = h.__code__.co_firstlineno result_h = ( 'Traceback (most recent call last):\n' - f' File "{__file__}", line {lineno_h+7}, in _check_recursive_traceback_display\n' + f' File "{__file__}", line {lineno_h+7}, in _check_recursive_traceback_display''\n' ' h()\n' - f' File "{__file__}", line {lineno_h+2}, in h\n' + f' File "{__file__}", line {lineno_h+2}, in h''\n' ' return h(count-1)\n' - f' File "{__file__}", line {lineno_h+2}, in h\n' + f' File "{__file__}", line {lineno_h+2}, in h''\n' ' return h(count-1)\n' - f' File "{__file__}", line {lineno_h+2}, in h\n' + f' File "{__file__}", line {lineno_h+2}, in h''\n' ' return h(count-1)\n' ' [Previous line repeated 6 more times]\n' - f' File "{__file__}", line {lineno_h+3}, in h\n' + f' File "{__file__}", line {lineno_h+3}, in h''\n' ' g()\n' ) expected = (result_h + result_g).splitlines() |