Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix getargs argument passing #18350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 28, 2024
Merged

Fix getargs argument passing #18350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd5d67d
Fix getargs argument passing
hauntsaninja Dec 28, 2024
c00d967
Update mypyc/test-data/run-classes.test
hauntsaninja Dec 28, 2024
9856dce
vanity
hauntsaninja Dec 28, 2024
df34517
more unlikely
hauntsaninja Dec 28, 2024
9a46130
remove tildes
hauntsaninja Dec 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions mypyc/lib-rt/getargs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,13 +250,12 @@ vgetargskeywords(PyObject *args, PyObject *kwargs, const char *format,
current_arg = Py_NewRef(PyTuple_GET_ITEM(args, i));
}
else if (nkwargs && i >= pos) {
int res = PyDict_GetItemStringRef(kwargs, kwlist[i], &current_arg);
if (res == 1) {
--nkwargs;
}
else if (res == -1) {
if (unlikely(PyDict_GetItemStringRef(kwargs, kwlist[i], &current_arg) < 0)) {
return 0;
}
if (current_arg) {
--nkwargs;
}
}
else {
current_arg = NULL;
Expand Down Expand Up @@ -371,11 +370,12 @@ vgetargskeywords(PyObject *args, PyObject *kwargs, const char *format,
Py_ssize_t j;
/* make sure there are no arguments given by name and position */
for (i = pos; i < bound_pos_args && i < len; i++) {
int res = PyDict_GetItemStringRef(kwargs, kwlist[i], &current_arg);
if (res == 1) {
Py_DECREF(current_arg);
PyObject *current_arg;
if (unlikely(PyDict_GetItemStringRef(kwargs, kwlist[i], &current_arg) < 0)) {
goto latefail;
}
else if (unlikely(res == 0)) {
if (unlikely(current_arg != NULL)) {
Py_DECREF(current_arg);
/* arg present in tuple and in dict */
PyErr_Format(PyExc_TypeError,
"argument for %.200s%s given by name ('%s') "
Expand All @@ -385,9 +385,6 @@ vgetargskeywords(PyObject *args, PyObject *kwargs, const char *format,
kwlist[i], i+1);
goto latefail;
}
else if (unlikely(res == -1)) {
goto latefail;
}
}
/* make sure there are no extraneous keyword arguments */
j = 0;
Expand Down
15 changes: 15 additions & 0 deletions mypyc/test-data/run-classes.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,21 @@ a = A(10)
assert a.foo() == 11
assert foo() == 21

[case testClassKwargs]
class X:
def __init__(self, msg: str, **variables: int) -> None:
pass
[file driver.py]
import traceback
from native import X
X('hello', a=0)
try:
X('hello', msg='hello')
except TypeError as e:
print(f"{type(e).__name__}: {e}")
[out]
TypeError: argument for __init__() given by name ('msg') and position (1)

[case testGenericClass]
from typing import TypeVar, Generic, Sequence
T = TypeVar('T')
Expand Down
Loading