Skip to content

Don't encode dataclass classes #755

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 1 commit into from
Oct 20, 2024
Merged

Don't encode dataclass classes #755

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
6 changes: 3 additions & 3 deletions msgspec/_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13137,7 +13137,7 @@ mpack_encode_uncommon(EncoderState *self, PyTypeObject *type, PyObject *obj)
else if (PyAnySet_Check(obj)) {
return mpack_encode_set(self, obj);
}
else if (type->tp_dict != NULL) {
else if (!PyType_Check(obj) && type->tp_dict != NULL) {
PyObject *fields = PyObject_GetAttr(obj, self->mod->str___dataclass_fields__);
if (fields != NULL) {
int status = mpack_encode_dataclass(self, obj, fields);
Expand Down Expand Up @@ -14231,7 +14231,7 @@ json_encode_uncommon(EncoderState *self, PyTypeObject *type, PyObject *obj) {
else if (PyAnySet_Check(obj)) {
return json_encode_set(self, obj);
}
else if (type->tp_dict != NULL) {
else if (!PyType_Check(obj) && type->tp_dict != NULL) {
PyObject *fields = PyObject_GetAttr(obj, self->mod->str___dataclass_fields__);
if (fields != NULL) {
int status = json_encode_dataclass(self, obj, fields);
Expand Down Expand Up @@ -19924,7 +19924,7 @@ to_builtins(ToBuiltinsState *self, PyObject *obj, bool is_key) {
else if (PyAnySet_Check(obj)) {
return to_builtins_set(self, obj, is_key);
}
else if (type->tp_dict != NULL) {
else if (!PyType_Check(obj) && type->tp_dict != NULL) {
PyObject *fields = PyObject_GetAttr(obj, self->mod->str___dataclass_fields__);
if (fields != NULL) {
PyObject *out = to_builtins_dataclass(self, obj, fields);
Expand Down
8 changes: 8 additions & 0 deletions tests/test_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2490,6 +2490,14 @@ class Ex:
with pytest.raises(RuntimeError, match="is not a dict"):
proto.encode(Ex(1))

def test_encode_dataclass_class_errors(self, proto):
@dataclass
class Ex:
x: int

with pytest.raises(TypeError, match="Encoding objects of type type"):
proto.encode(Ex)

def test_encode_dataclass_no_slots(self, proto):
@dataclass
class Test:
Expand Down
8 changes: 8 additions & 0 deletions tests/test_to_builtins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,14 @@ class Ex:
with pytest.raises(TypeError, match="Encoding objects of type Bad"):
to_builtins(msg)

def test_dataclass_class_errors(self):
@dataclass
class Ex:
x: int

with pytest.raises(TypeError, match="Encoding objects of type type"):
to_builtins(Ex)

@pytest.mark.parametrize("slots", [True, False])
def test_attrs(self, slots):
attrs = pytest.importorskip("attrs")
Expand Down
Loading