Skip to content

Improve error for invalid kwarg in Struct.__init__ #273

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
jcrist merged 1 commit into from
Jan 21, 2023
Merged

Improve error for invalid kwarg in Struct.__init__ #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion msgspec/_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6038,7 +6038,7 @@ Struct_vectorcall(PyTypeObject *cls, PyObject *const *args, size_t nargsf, PyObj
}

/* Unknown keyword */
PyErr_SetString(PyExc_TypeError, "Extra keyword arguments provided");
PyErr_Format(PyExc_TypeError, "Unexpected keyword argument '%U'", kwname);
goto error;

kw_found:
Expand Down
6 changes: 3 additions & 3 deletions tests/test_struct.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ class Test(Struct):
with pytest.raises(TypeError, match="Argument 'a' given by name and position"):
Test(1, 2, a=3)

with pytest.raises(TypeError, match="Extra keyword arguments provided"):
with pytest.raises(TypeError, match="Unexpected keyword argument 'e'"):
Test(1, 2, e=5)

def test_init_kw_only(self):
Expand All @@ -441,7 +441,7 @@ class Test(Struct, kw_only=True):
with pytest.raises(TypeError, match="Extra positional arguments provided"):
Test(1)

with pytest.raises(TypeError, match="Extra keyword arguments provided"):
with pytest.raises(TypeError, match="Unexpected keyword argument 'e'"):
Test(a=1, e=5)

def test_init_kw_only_mixed(self):
Expand All @@ -468,7 +468,7 @@ class Test(Base):
with pytest.raises(TypeError, match="Extra positional arguments provided"):
Test(1, 5.0, 3)

with pytest.raises(TypeError, match="Extra keyword arguments provided"):
with pytest.raises(TypeError, match="Unexpected keyword argument 'e'"):
Test(1, e=5)


Expand Down