Skip to content

Commit cd74e66

Browse files
pablogsalpablogsal
authored
bpo-37122: Make co->co_argcount represent the total number of positonal arguments in the code object (GH-13726)
1 parent 059b9ea commit cd74e66

File tree

14 files changed

+74
-88
lines changed

14 files changed

+74
-88
lines changed

‎Doc/c-api/code.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ bound into a function.
4242
4343
.. versionchanged:: 3.8
4444
An extra parameter is required (*posonlyargcount*) to support :PEP:`570`.
45+
The first parameter (*argcount*) now represents the total number of positional arguments,
46+
including positional-only.
4547
4648
.. audit-event:: code.__new__ "code filename name argcount kwonlyargcount nlocals stacksize flags"
4749

‎Doc/reference/datamodel.rst‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -907,24 +907,26 @@ Internal types
907907
single: co_freevars (code object attribute)
908908

909909
Special read-only attributes: :attr:`co_name` gives the function name;
910-
:attr:`co_argcount` is the number of positional arguments (including arguments
911-
with default values); :attr:`co_posonlyargcount` is the number of
912-
positional-only arguments (including arguments with default values);
913-
:attr:`co_kwonlyargcount` is the number of keyword-only arguments (including
914-
arguments with default values); :attr:`co_nlocals` is the number of local
915-
variables used by the function (including arguments); :attr:`co_varnames` is a
916-
tuple containing the names of the local variables (starting with the argument
917-
names); :attr:`co_cellvars` is a tuple containing the names of local variables
910+
:attr:`co_argcount` is the total number of positional arguments
911+
(including positional-only arguments and arguments with default values);
912+
:attr:`co_posonlyargcount` is the number of positional-only arguments
913+
(including arguments with default values); :attr:`co_kwonlyargcount` is
914+
the number of keyword-only arguments (including arguments with default
915+
values); :attr:`co_nlocals` is the number of local variables used by the
916+
function (including arguments); :attr:`co_varnames` is a tuple containing
917+
the names of the local variables (starting with the argument names);
918+
:attr:`co_cellvars` is a tuple containing the names of local variables
918919
that are referenced by nested functions; :attr:`co_freevars` is a tuple
919-
containing the names of free variables; :attr:`co_code` is a string representing
920-
the sequence of bytecode instructions; :attr:`co_consts` is a tuple containing
921-
the literals used by the bytecode; :attr:`co_names` is a tuple containing the
922-
names used by the bytecode; :attr:`co_filename` is the filename from which the
923-
code was compiled; :attr:`co_firstlineno` is the first line number of the
924-
function; :attr:`co_lnotab` is a string encoding the mapping from bytecode
925-
offsets to line numbers (for details see the source code of the interpreter);
926-
:attr:`co_stacksize` is the required stack size (including local variables);
927-
:attr:`co_flags` is an integer encoding a number of flags for the interpreter.
920+
containing the names of free variables; :attr:`co_code` is a string
921+
representing the sequence of bytecode instructions; :attr:`co_consts` is
922+
a tuple containing the literals used by the bytecode; :attr:`co_names` is
923+
a tuple containing the names used by the bytecode; :attr:`co_filename` is
924+
the filename from which the code was compiled; :attr:`co_firstlineno` is
925+
the first line number of the function; :attr:`co_lnotab` is a string
926+
encoding the mapping from bytecode offsets to line numbers (for details
927+
see the source code of the interpreter); :attr:`co_stacksize` is the
928+
required stack size (including local variables); :attr:`co_flags` is an
929+
integer encoding a number of flags for the interpreter.
928930

929931
.. index:: object: generator
930932

‎Doc/whatsnew/3.8.rst‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,8 +1177,10 @@ Changes in the Python API
11771177

11781178
* :class:`types.CodeType` has a new parameter in the second position of the
11791179
constructor (*posonlyargcount*) to support positional-only arguments defined
1180-
in :pep:`570`. A new ``replace()`` method of :class:`types.CodeType` can be
1181-
used to make the code future-proof.
1180+
in :pep:`570`. The first argument (*argcount*) now represents the total
1181+
number of positional arguments (including positional-only arguments). A new
1182+
``replace()`` method of :class:`types.CodeType` can be used to make the code
1183+
future-proof.
11821184

11831185

11841186
Changes in the C API

‎Lib/inspect.py‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,15 +1037,11 @@ def getargs(co):
10371037

10381038
names = co.co_varnames
10391039
nargs = co.co_argcount
1040-
nposonlyargs = co.co_posonlyargcount
10411040
nkwargs = co.co_kwonlyargcount
1042-
nposargs = nargs + nposonlyargs
1043-
posonlyargs = list(names[:nposonlyargs])
1044-
args = list(names[nposonlyargs:nposonlyargs+nargs])
1045-
kwonlyargs = list(names[nposargs:nposargs+nkwargs])
1041+
args = list(names[:nargs])
1042+
kwonlyargs = list(names[nargs:nargs+nkwargs])
10461043
step = 0
10471044

1048-
nargs += nposonlyargs
10491045
nargs += nkwargs
10501046
varargs = None
10511047
if co.co_flags & CO_VARARGS:
@@ -1054,7 +1050,7 @@ def getargs(co):
10541050
varkw = None
10551051
if co.co_flags & CO_VARKEYWORDS:
10561052
varkw = co.co_varnames[nargs]
1057-
return Arguments(posonlyargs + args + kwonlyargs, varargs, varkw)
1053+
return Arguments(args + kwonlyargs, varargs, varkw)
10581054

10591055
ArgSpec = namedtuple('ArgSpec', 'args varargs keywords defaults')
10601056

@@ -2136,11 +2132,9 @@ def _signature_from_function(cls, func, skip_bound_arg=True):
21362132
pos_count = func_code.co_argcount
21372133
arg_names = func_code.co_varnames
21382134
posonly_count = func_code.co_posonlyargcount
2139-
positional_count = posonly_count + pos_count
2140-
positional_only = tuple(arg_names[:posonly_count])
2141-
positional = tuple(arg_names[posonly_count:positional_count])
2135+
positional = arg_names[:pos_count]
21422136
keyword_only_count = func_code.co_kwonlyargcount
2143-
keyword_only = arg_names[positional_count:(positional_count + keyword_only_count)]
2137+
keyword_only = arg_names[pos_count:pos_count + keyword_only_count]
21442138
annotations = func.__annotations__
21452139
defaults = func.__defaults__
21462140
kwdefaults = func.__kwdefaults__
@@ -2152,13 +2146,11 @@ def _signature_from_function(cls, func, skip_bound_arg=True):
21522146

21532147
parameters = []
21542148

2155-
non_default_count = positional_count - pos_default_count
2156-
all_positional = positional_only + positional
2157-
2149+
non_default_count = pos_count - pos_default_count
21582150
posonly_left = posonly_count
21592151

21602152
# Non-keyword-only parameters w/o defaults.
2161-
for name in all_positional[:non_default_count]:
2153+
for name in positional[:non_default_count]:
21622154
kind = _POSITIONAL_ONLY if posonly_left else _POSITIONAL_OR_KEYWORD
21632155
annotation = annotations.get(name, _empty)
21642156
parameters.append(Parameter(name, annotation=annotation,
@@ -2167,7 +2159,7 @@ def _signature_from_function(cls, func, skip_bound_arg=True):
21672159
posonly_left -= 1
21682160

21692161
# ... w/ defaults.
2170-
for offset, name in enumerate(all_positional[non_default_count:]):
2162+
for offset, name in enumerate(positional[non_default_count:]):
21712163
kind = _POSITIONAL_ONLY if posonly_left else _POSITIONAL_OR_KEYWORD
21722164
annotation = annotations.get(name, _empty)
21732165
parameters.append(Parameter(name, annotation=annotation,
@@ -2178,7 +2170,7 @@ def _signature_from_function(cls, func, skip_bound_arg=True):
21782170

21792171
# *args
21802172
if func_code.co_flags & CO_VARARGS:
2181-
name = arg_names[positional_count + keyword_only_count]
2173+
name = arg_names[pos_count + keyword_only_count]
21822174
annotation = annotations.get(name, _empty)
21832175
parameters.append(Parameter(name, annotation=annotation,
21842176
kind=_VAR_POSITIONAL))
@@ -2195,7 +2187,7 @@ def _signature_from_function(cls, func, skip_bound_arg=True):
21952187
default=default))
21962188
# **kwargs
21972189
if func_code.co_flags & CO_VARKEYWORDS:
2198-
index = positional_count + keyword_only_count
2190+
index = pos_count + keyword_only_count
21992191
if func_code.co_flags & CO_VARARGS:
22002192
index += 1
22012193

‎Lib/pdb.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1132,7 +1132,7 @@ def do_args(self, arg):
11321132
"""
11331133
co = self.curframe.f_code
11341134
dict = self.curframe_locals
1135-
n = co.co_argcount + co.co_posonlyargcount + co.co_kwonlyargcount
1135+
n = co.co_argcount + co.co_kwonlyargcount
11361136
if co.co_flags & inspect.CO_VARARGS: n = n+1
11371137
if co.co_flags & inspect.CO_VARKEYWORDS: n = n+1
11381138
for i in range(n):

‎Lib/test/test_code.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
113113
>>> dump(posonly_args.__code__)
114114
name: posonly_args
115-
argcount: 1
115+
argcount: 3
116116
posonlyargcount: 2
117117
kwonlyargcount: 0
118118
names: ()

‎Lib/test/test_dis.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ def f(c=c):
640640
code_info_tricky = """\
641641
Name: tricky
642642
Filename: (.*)
643-
Argument count: 3
643+
Argument count: 5
644644
Positional-only arguments: 2
645645
Kw-only arguments: 3
646646
Number of locals: 10

‎Lib/test/test_positional_only_arg.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,14 @@ def test_pos_only_definition(self):
100100
def f(a, b, c, /, d, e=1, *, f, g=2):
101101
pass
102102

103-
self.assertEqual(2, f.__code__.co_argcount) # 2 "standard args"
103+
self.assertEqual(5, f.__code__.co_argcount) # 3 posonly + 2 "standard args"
104104
self.assertEqual(3, f.__code__.co_posonlyargcount)
105105
self.assertEqual((1,), f.__defaults__)
106106

107107
def f(a, b, c=1, /, d=2, e=3, *, f, g=4):
108108
pass
109109

110-
self.assertEqual(2, f.__code__.co_argcount) # 2 "standard args"
110+
self.assertEqual(5, f.__code__.co_argcount) # 3 posonly + 2 "standard args"
111111
self.assertEqual(3, f.__code__.co_posonlyargcount)
112112
self.assertEqual((1, 2, 3), f.__defaults__)
113113

‎Misc/NEWS.d/next/Core and Builtins/2019-06-01-16-53-41.bpo-37122.dZ3-NY.rst‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Make the *co_argcount* attribute of code objects represent the total number
2+
of positional arguments (including positional-only arguments). The value of
3+
*co_posonlyargcount* can be used to distinguish which arguments are
4+
positional only, and the difference (*co_argcount* - *co_posonlyargcount*)
5+
is the number of positional-or-keyword arguments. Patch by Pablo Galindo.

‎Objects/call.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -308,11 +308,11 @@ _PyFunction_FastCallDict(PyObject *func, PyObject *const *args, Py_ssize_t nargs
308308
(co->co_flags & ~PyCF_MASK) == (CO_OPTIMIZED | CO_NEWLOCALS | CO_NOFREE))
309309
{
310310
/* Fast paths */
311-
if (argdefs == NULL && co->co_argcount + co->co_posonlyargcount == nargs) {
311+
if (argdefs == NULL && co->co_argcount == nargs) {
312312
return function_code_fastcall(co, args, nargs, globals);
313313
}
314314
else if (nargs == 0 && argdefs != NULL
315-
&& co->co_argcount + co->co_posonlyargcount == PyTuple_GET_SIZE(argdefs)) {
315+
&& co->co_argcount == PyTuple_GET_SIZE(argdefs)) {
316316
/* function called with no arguments, but all parameters have
317317
a default value: use default values as arguments .*/
318318
args = _PyTuple_ITEMS(argdefs);
@@ -396,11 +396,11 @@ _PyFunction_Vectorcall(PyObject *func, PyObject* const* stack,
396396
if (co->co_kwonlyargcount == 0 && nkwargs == 0 &&
397397
(co->co_flags & ~PyCF_MASK) == (CO_OPTIMIZED | CO_NEWLOCALS | CO_NOFREE))
398398
{
399-
if (argdefs == NULL && co->co_argcount + co->co_posonlyargcount== nargs) {
399+
if (argdefs == NULL && co->co_argcount == nargs) {
400400
return function_code_fastcall(co, stack, nargs, globals);
401401
}
402402
else if (nargs == 0 && argdefs != NULL
403-
&& co->co_argcount + co->co_posonlyargcount == PyTuple_GET_SIZE(argdefs)) {
403+
&& co->co_argcount == PyTuple_GET_SIZE(argdefs)) {
404404
/* function called with no arguments, but all parameters have
405405
a default value: use default values as arguments .*/
406406
stack = _PyTuple_ITEMS(argdefs);

0 commit comments

Comments
 (0)