Skip to content

Allow None to be passed into loads for object_hook and dumps for defa… #83

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
lelit merged 1 commit into from
Sep 30, 2017
Merged

Allow None to be passed into loads for object_hook and dumps for defa… #83

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
7 changes: 7 additions & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
Changes
-------

Unreleased
~~~~~~~~~~

* Fix bug where loads's ``object_hook`` and dumps's ``default`` arguments could
not be passed ``None`` explicitly.


0.2.4 (2017-09-17)
~~~~~~~~~~~~~~~~~~

Expand Down
16 changes: 12 additions & 4 deletions rapidjson.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1008,8 +1008,12 @@ loads(PyObject* self, PyObject* args, PyObject* kwargs)
return NULL;

if (objectHook && !PyCallable_Check(objectHook)) {
PyErr_SetString(PyExc_TypeError, "object_hook is not callable");
return NULL;
if (objectHook == Py_None)
objectHook = NULL;
else {
PyErr_SetString(PyExc_TypeError, "object_hook is not callable");
return NULL;
}
}

Py_ssize_t jsonStrLen;
Expand Down Expand Up @@ -2130,8 +2134,12 @@ dumps(PyObject* self, PyObject* args, PyObject* kwargs)
return NULL;

if (defaultFn && !PyCallable_Check(defaultFn)) {
PyErr_SetString(PyExc_TypeError, "default must be a callable");
return NULL;
if (defaultFn == Py_None)
defaultFn = NULL;
else {
PyErr_SetString(PyExc_TypeError, "default must be a callable");
return NULL;
}
}

if (indent && indent != Py_None) {
Expand Down
30 changes: 30 additions & 0 deletions tests/test_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,3 +557,33 @@ def test_invalid_dumps_params(posargs, kwargs, dumps):
pass
else:
assert False, "Expected either a TypeError or a ValueError"


@pytest.mark.unit
def test_explicit_defaults_loads():
assert rj.loads(
s='"foo"',
object_hook=None,
number_mode=None,
datetime_mode=None,
uuid_mode=None,
parse_mode=None,
allow_nan=True,
) == "foo"


@pytest.mark.unit
def test_explicit_defaults_dumps():
assert rj.dumps(
obj='foo',
skipkeys=False,
ensure_ascii=True,
indent=None,
default=None,
sort_keys=False,
max_recursion_depth=2048,
number_mode=None,
datetime_mode=None,
uuid_mode=None,
allow_nan=True,
) == '"foo"'