revert some changes to error reporting to keep <stdin> in tracebacks instead of <stdin-N>

Author: adqm

Lib/test/test_cmd_line_script.py

@@ -203,7 +203,7 @@ def check_repl_stderr_flush(self, separate_stderr=False):
             p.stdin.flush()
             stderr = p.stderr if separate_stderr else p.stdout
             self.assertIn(b'Traceback ', stderr.readline())
-            self.assertIn(b'File "<stdin-0>"', stderr.readline())
+            self.assertIn(b'File "<stdin>"', stderr.readline())
             self.assertIn(b'1/0', stderr.readline())
             self.assertIn(b'    ~^~', stderr.readline())
             self.assertIn(b'ZeroDivisionError', stderr.readline())

Lib/test/test_repl.py

@@ -156,7 +156,7 @@ def test_interactive_traceback_reporting(self):
         traceback_lines = output.splitlines()[-6:-1]
         expected_lines = [
             "Traceback (most recent call last):",
-            "  File \"<stdin-0>\", line 1, in <module>",
+            "  File \"<stdin>\", line 1, in <module>",
             "    1 / 0 / 3 / 4",
             "    ~~^~~",
             "ZeroDivisionError: division by zero",
@@ -178,10 +178,10 @@ def foo(x):
 
         traceback_lines = output.splitlines()[-8:-1]
         expected_lines = [
-            '  File "<stdin-2>", line 1, in <module>',
+            '  File "<stdin>", line 1, in <module>',
             '    foo(0)',
             '    ~~~^^^',
-            '  File "<stdin-1>", line 2, in foo',
+            '  File "<stdin>", line 2, in foo',
             '    1 / x',
             '    ~~^~~',
             'ZeroDivisionError: division by zero'
@@ -216,7 +216,7 @@ def make_repl(env):
             output = kill_python(p)
         expected = dedent("""
             Traceback (most recent call last):
-              File "<stdin-0>", line 1, in <module>
+              File "<stdin>", line 1, in <module>
                 1/0
                 ~^~
             ZeroDivisionError: division by zero
@@ -238,7 +238,7 @@ def make_repl(env):
             output = kill_python(p)
         expected = dedent("""
             Traceback (most recent call last):
-              File "<stdin-0>", line 1, in <module>
+              File "<stdin>", line 1, in <module>
                 foo()
                 ~~~^^
               File "%s", line 2, in foo

Lib/traceback.py

@@ -541,7 +541,7 @@ def format_frame_summary(self, frame_summary, **kwargs):
         colorize = kwargs.get("colorize", False)
         row = []
         filename = frame_summary.filename
-        if frame_summary.filename.startswith("<stdin>-"):
+        if frame_summary.filename.startswith("<stdin-") and frame_summary.filename.endswith('>'):
             filename = "<stdin>"
         if colorize:
             theme = _colorize.get_theme(force_color=True).traceback