[Python-checkins] cpython (merge default -> default): Merge upstream change.

[vinay.sajip]

https://hg.python.org/cpython/rev/0bd8975e2407
changeset:   103020:0bd8975e2407
parent:      103019:773c9401735f
parent:      103016:80eb6eb57537
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Sat Sep 03 16:55:35 2016 +0100
summary:
  Merge upstream change.

files:
  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
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@ -325,13 +325,13 @@
         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 @@
 
         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 @@
         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()

-- 
Repository URL: https://hg.python.org/cpython