Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
orjson
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OpenVMS
Python
Modules
orjson
Commits
a9eff9f72d1e
Commit
a9eff9f72d1e
authored
5 years ago
by
ijl
Browse files
Options
Downloads
Patches
Plain Diff
Fix serializing empty dataclass
parent
282ba2dc0eda
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/dataclass.rs
+3
-0
3 additions, 0 deletions
src/dataclass.rs
src/encode.rs
+3
-0
3 additions, 0 deletions
src/encode.rs
test/test_dataclass.py
+28
-0
28 additions, 0 deletions
test/test_dataclass.py
with
34 additions
and
0 deletions
src/dataclass.rs
+
3
−
0
View file @
a9eff9f7
...
@@ -46,6 +46,9 @@
...
@@ -46,6 +46,9 @@
let
fields
=
ffi!
(
PyObject_GetAttr
(
self
.ptr
,
DATACLASS_FIELDS_STR
));
let
fields
=
ffi!
(
PyObject_GetAttr
(
self
.ptr
,
DATACLASS_FIELDS_STR
));
ffi!
(
Py_DECREF
(
fields
));
ffi!
(
Py_DECREF
(
fields
));
let
len
=
unsafe
{
PyDict_GET_SIZE
(
fields
)
as
usize
};
let
len
=
unsafe
{
PyDict_GET_SIZE
(
fields
)
as
usize
};
if
unlikely!
(
len
==
0
)
{
return
serializer
.serialize_map
(
Some
(
0
))
.unwrap
()
.end
();
}
let
mut
map
=
serializer
.serialize_map
(
None
)
.unwrap
();
let
mut
map
=
serializer
.serialize_map
(
None
)
.unwrap
();
let
mut
pos
=
0isize
;
let
mut
pos
=
0isize
;
let
mut
str_size
:
pyo3
::
ffi
::
Py_ssize_t
=
0
;
let
mut
str_size
:
pyo3
::
ffi
::
Py_ssize_t
=
0
;
...
...
This diff is collapsed.
Click to expand it.
src/encode.rs
+
3
−
0
View file @
a9eff9f7
...
@@ -366,6 +366,9 @@
...
@@ -366,6 +366,9 @@
if
!
dict
.is_null
()
{
if
!
dict
.is_null
()
{
ffi!
(
Py_DECREF
(
dict
));
ffi!
(
Py_DECREF
(
dict
));
let
len
=
unsafe
{
PyDict_GET_SIZE
(
dict
)
as
usize
};
let
len
=
unsafe
{
PyDict_GET_SIZE
(
dict
)
as
usize
};
if
unlikely!
(
len
==
0
)
{
return
serializer
.serialize_map
(
Some
(
0
))
.unwrap
()
.end
();
}
let
mut
map
=
serializer
.serialize_map
(
None
)
.unwrap
();
let
mut
map
=
serializer
.serialize_map
(
None
)
.unwrap
();
let
mut
pos
=
0isize
;
let
mut
pos
=
0isize
;
let
mut
str_size
:
pyo3
::
ffi
::
Py_ssize_t
=
0
;
let
mut
str_size
:
pyo3
::
ffi
::
Py_ssize_t
=
0
;
...
...
This diff is collapsed.
Click to expand it.
test/test_dataclass.py
+
28
−
0
View file @
a9eff9f7
...
@@ -15,6 +15,18 @@
...
@@ -15,6 +15,18 @@
@dataclass
@dataclass
class
EmptyDataclass
:
pass
@dataclass
class
EmptyDataclassSlots
:
__slots__
=
()
pass
@dataclass
class
Dataclass1
:
class
Dataclass1
:
name
:
str
name
:
str
number
:
int
number
:
int
...
@@ -115,6 +127,22 @@
...
@@ -115,6 +127,22 @@
with
self
.
assertRaises
(
orjson
.
JSONEncodeError
):
with
self
.
assertRaises
(
orjson
.
JSONEncodeError
):
orjson
.
dumps
(
obj1
)
orjson
.
dumps
(
obj1
)
def
test_dataclass_empty
(
self
):
"""
dumps() no attributes
"""
self
.
assertEqual
(
orjson
.
dumps
(
EmptyDataclass
()),
b
"
{}
"
,
)
def
test_dataclass_empty_slots
(
self
):
"""
dumps() no attributes slots
"""
self
.
assertEqual
(
orjson
.
dumps
(
EmptyDataclassSlots
()),
b
"
{}
"
,
)
def
test_dataclass_default_arg
(
self
):
def
test_dataclass_default_arg
(
self
):
"""
"""
dumps() dataclass default arg
dumps() dataclass default arg
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment