Skip to content

Commit 9e1e952

Browse files
port some Python wrapper code fixes from C++ jsonnet
See commits on the C++ repo: - google/jsonnet@913281d - google/jsonnet@842d31e
1 parent e1304d1 commit 9e1e952

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

python/_jsonnet.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ static struct JsonnetJsonValue *cpython_native_callback(
186186
}
187187

188188
// Call python function.
189-
result = PyEval_CallObject(ctx->callback, arglist);
189+
result = PyObject_CallObject(ctx->callback, arglist);
190190
Py_DECREF(arglist);
191191

192192
if (result == NULL) {
@@ -226,7 +226,7 @@ static int cpython_import_callback(void *ctx_, const char *base, const char *rel
226226

227227
PyEval_RestoreThread(*ctx->py_thread);
228228
arglist = Py_BuildValue("(s, s)", base, rel);
229-
result = PyEval_CallObject(ctx->callback, arglist);
229+
result = PyObject_CallObject(ctx->callback, arglist);
230230
Py_DECREF(arglist);
231231

232232
if (result == NULL) {
@@ -255,7 +255,7 @@ static int cpython_import_callback(void *ctx_, const char *base, const char *rel
255255
success = 0;
256256
} else {
257257
char *content_buf;
258-
ssize_t content_len;
258+
Py_ssize_t content_len;
259259
#if PY_MAJOR_VERSION >= 3
260260
const char *found_here_cstr = PyUnicode_AsUTF8(file_name);
261261
#else
@@ -665,7 +665,7 @@ static struct PyModuleDef _module =
665665

666666
PyMODINIT_FUNC PyInit__gojsonnet(void)
667667
{
668-
PyObject *module = PyModule_Create(&_module);
668+
PyObject *module = PyModule_Create(&_module);
669669
PyObject *version_str = PyUnicode_FromString(LIB_JSONNET_VERSION);
670670
if (PyModule_AddObject(module, "version", PyUnicode_FromString(LIB_JSONNET_VERSION)) < 0) {
671671
Py_XDECREF(version_str);

0 commit comments

Comments
 (0)