Skip to content

fix: retain Python native callback parameter names until registration #1333

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

Open
rksharma-owg wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −3
Open

fix: retain Python native callback parameter names until registration #1333

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
11 changes: 8 additions & 3 deletions python/_jsonnet.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,10 +448,10 @@ static int handle_native_callbacks(struct JsonnetVm *vm, PyObject *native_callba
num_params = PyTuple_Size(params);
/* Include space for terminating NULL. */
const char **params_c = malloc(sizeof(const char*) * (num_params + 1));
struct StrRefAndObj *params_utf8 = malloc(sizeof(*params_utf8) * num_params);
for (i = 0; i < num_params ; ++i) {
struct StrRefAndObj param_c_utf8 = get_py_utf8_string(PyTuple_GetItem(params, i));
params_c[i] = param_c_utf8.cstr;
release_py_utf8_string(&param_c_utf8);
params_utf8[i] = get_py_utf8_string(PyTuple_GetItem(params, i));
params_c[i] = params_utf8[i].cstr;
}
params_c[num_params] = NULL;
(*ctxs)[num_natives].vm = vm;
Expand All @@ -461,6 +461,11 @@ static int handle_native_callbacks(struct JsonnetVm *vm, PyObject *native_callba
jsonnet_native_callback(vm, key_utf8.cstr, cpython_native_callback, &(*ctxs)[num_natives],
params_c);
release_py_utf8_string(&key_utf8);
/* Registration copies the names, so keep their UTF-8 storage alive until now. */
for (i = 0; i < num_params ; ++i) {
release_py_utf8_string(&params_utf8[i]);
}
free(params_utf8);
free(params_c);
num_natives++;
}
Expand Down
14 changes: 14 additions & 0 deletions python/_jsonnet_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import json
import os
import sys
import unittest
Expand Down Expand Up @@ -85,6 +86,19 @@ def setUp(self):
with open(self.input_filename, "r") as infile:
self.input_snippet = infile.read()

def test_native_callback_multichar_parameter_names(self):
for params, arguments, expected in (
(("target", "path"), '("hello", "world")', ["hello", "world"]),
(("first", "second", "third"), '("one", "two", "three")', ["one", "two", "three"]),
(("target", "path"), '(path="world", target="hello")', ["hello", "world"]),
):
with self.subTest(params=params, arguments=arguments):
result = _jsonnet.evaluate_snippet(
"test", 'std.native("collect")' + arguments,
native_callbacks={"collect": (params, lambda *values: list(values))},
)
self.assertEqual(json.loads(result), expected)

def test_version(self):
self.assertEqual(type(_jsonnet.version), str)

Expand Down