From cfe4bf309cb0a548a37e69a53cc9aed7f1920ddc Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Thu, 5 Jun 2025 12:47:38 +0300 Subject: [PATCH] gh-133438: Fix the use of the terms "argument" and "parameter" in dis.show_code() --- Lib/dis.py | 6 +-- Lib/test/test_dis.py | 42 +++++++++---------- ...-06-05-12-47-32.gh-issue-133438.R4U-Vz.rst | 2 + 3 files changed, 26 insertions(+), 24 deletions(-) create mode 100644 Misc/NEWS.d/next/Library/2025-06-05-12-47-32.gh-issue-133438.R4U-Vz.rst diff --git a/Lib/dis.py b/Lib/dis.py index d6d2c1386dd785..db7ac0c58616c8 100644 --- a/Lib/dis.py +++ b/Lib/dis.py @@ -246,9 +246,9 @@ def _format_code_info(co): lines = [] lines.append("Name: %s" % co.co_name) lines.append("Filename: %s" % co.co_filename) - lines.append("Argument count: %s" % co.co_argcount) - lines.append("Positional-only arguments: %s" % co.co_posonlyargcount) - lines.append("Kw-only arguments: %s" % co.co_kwonlyargcount) + lines.append("Positional parameters: %s" % co.co_argcount) + lines.append("Positional-only parameters: %s" % co.co_posonlyargcount) + lines.append("Keyword-only parameters: %s" % co.co_kwonlyargcount) lines.append("Number of locals: %s" % co.co_nlocals) lines.append("Stack size: %s" % co.co_stacksize) lines.append("Flags: %s" % pretty_flags(co.co_flags)) diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py index 355990ed58ee09..e8048e1cdbce11 100644 --- a/Lib/test/test_dis.py +++ b/Lib/test/test_dis.py @@ -1461,9 +1461,9 @@ def get_disassembly(self, func, lasti=-1, wrapper=True, **kwargs): code_info_code_info = f"""\ Name: code_info Filename: (.*) -Argument count: 1 -Positional-only arguments: 0 -Kw-only arguments: 0 +Positional parameters: 1 +Positional-only parameters: 0 +Keyword-only parameters: 0 Number of locals: 1 Stack size: \\d+ Flags: OPTIMIZED, NEWLOCALS, HAS_DOCSTRING @@ -1485,9 +1485,9 @@ def f(c=c): code_info_tricky = """\ Name: tricky Filename: (.*) -Argument count: 5 -Positional-only arguments: 2 -Kw-only arguments: 3 +Positional parameters: 5 +Positional-only parameters: 2 +Keyword-only parameters: 3 Number of locals: 10 Stack size: \\d+ Flags: OPTIMIZED, NEWLOCALS, VARARGS, VARKEYWORDS, GENERATOR @@ -1520,9 +1520,9 @@ def f(c=c): code_info_tricky_nested_f = """\ Filename: (.*) -Argument count: 1 -Positional-only arguments: 0 -Kw-only arguments: 0 +Positional parameters: 1 +Positional-only parameters: 0 +Keyword-only parameters: 0 Number of locals: 1 Stack size: \\d+ Flags: OPTIMIZED, NEWLOCALS, NESTED @@ -1543,9 +1543,9 @@ def f(c=c): code_info_expr_str = """\ Name: Filename: -Argument count: 0 -Positional-only arguments: 0 -Kw-only arguments: 0 +Positional parameters: 0 +Positional-only parameters: 0 +Keyword-only parameters: 0 Number of locals: 0 Stack size: \\d+ Flags: 0x0 @@ -1557,9 +1557,9 @@ def f(c=c): code_info_simple_stmt_str = """\ Name: Filename: -Argument count: 0 -Positional-only arguments: 0 -Kw-only arguments: 0 +Positional parameters: 0 +Positional-only parameters: 0 +Keyword-only parameters: 0 Number of locals: 0 Stack size: \\d+ Flags: 0x0 @@ -1572,9 +1572,9 @@ def f(c=c): code_info_compound_stmt_str = """\ Name: Filename: -Argument count: 0 -Positional-only arguments: 0 -Kw-only arguments: 0 +Positional parameters: 0 +Positional-only parameters: 0 +Keyword-only parameters: 0 Number of locals: 0 Stack size: \\d+ Flags: 0x0 @@ -1592,9 +1592,9 @@ async def async_def(): code_info_async_def = """\ Name: async_def Filename: (.*) -Argument count: 0 -Positional-only arguments: 0 -Kw-only arguments: 0 +Positional parameters: 0 +Positional-only parameters: 0 +Keyword-only parameters: 0 Number of locals: 2 Stack size: \\d+ Flags: OPTIMIZED, NEWLOCALS, COROUTINE diff --git a/Misc/NEWS.d/next/Library/2025-06-05-12-47-32.gh-issue-133438.R4U-Vz.rst b/Misc/NEWS.d/next/Library/2025-06-05-12-47-32.gh-issue-133438.R4U-Vz.rst new file mode 100644 index 00000000000000..e76322371dad4c --- /dev/null +++ b/Misc/NEWS.d/next/Library/2025-06-05-12-47-32.gh-issue-133438.R4U-Vz.rst @@ -0,0 +1,2 @@ +Fix the use of the terms "argument" and "parameter" in +:func:`dis.show_code`.