post-merge

Author: AA-Turner

Lib/asyncio/__main__.py

@@ -156,12 +156,10 @@ def interrupt(self) -> None:
     )
     ps.add_argument("pid", type=int, help="Process ID to inspect")
     formats = [fmt.value for fmt in TaskTableOutputFormat]
-    formats_to_show = [
-        fmt for fmt in formats if fmt != TaskTableOutputFormat.bsv.value
-    ]
-    formats_to_show_str = f"{{{','.join(formats_to_show)}}}"
+    formats_to_show = [fmt for fmt in formats
+                       if fmt != TaskTableOutputFormat.bsv.value]
     ps.add_argument("--format", choices=formats, default="table",
-                    metavar=formats_to_show_str)
+                    metavar=f"{{{','.join(formats_to_show)}}}")
     pstree = subparsers.add_parser(
         "pstree", help="Display a tree of all pending tasks in a process"
     )

Lib/asyncio/tools.py

@@ -274,26 +274,14 @@ def _fmt_table_row(tid, task_id, task_name, coro_stack,
 
 def _display_awaited_by_tasks_csv(table, *, format):
     """Print the table in CSV format"""
-    if format == TaskTableOutputFormat.csv:
-        delimiter = ','
-    else:
-        raise ValueError(f"Unknown output format: {format}")
-    csv_writer = csv.writer(sys.stdout, delimiter=delimiter)
-    csv_writer.writerow(_row_header)
-    csv_writer.writerows(table)
-
-
-def _display_awaited_by_tasks_csv(table, format: TaskTableOutputFormat) -> None:
-    csv_header = ('tid', 'task id', 'task name', 'coroutine stack',
-                  'awaiter chain', 'awaiter name', 'awaiter id')
     if format == TaskTableOutputFormat.csv:
         delimiter = ','
     elif format == TaskTableOutputFormat.bsv:
         delimiter = '\N{BANANA}'
     else:
         raise ValueError(f"Unknown output format: {format}")
     csv_writer = csv.writer(sys.stdout, delimiter=delimiter)
-    csv_writer.writerow(csv_header)
+    csv_writer.writerow(_row_header)
     csv_writer.writerows(table)