From 30a863a0571ffd86e90961fb94bf6144ed1fd036 Mon Sep 17 00:00:00 2001 From: Hood Chatham Date: Sun, 10 Apr 2022 01:20:45 -0700 Subject: [PATCH] Fix invocations of _PyArg_ParseStackAndKeywords (#2382) --- src/core/jsproxy.c | 3 +-- src/core/python2js.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/core/jsproxy.c b/src/core/jsproxy.c index c241db3d8..8df0ec3e3 100644 --- a/src/core/jsproxy.c +++ b/src/core/jsproxy.c @@ -710,8 +710,7 @@ JsProxy_toPy(PyObject* self, static struct _PyArg_Parser _parser = { "|$iO:toPy", _keywords, 0 }; int depth = -1; PyObject* default_converter = NULL; - if (kwnames != NULL && - !_PyArg_ParseStackAndKeywords( + if (!_PyArg_ParseStackAndKeywords( args, nargs, kwnames, &_parser, &depth, &default_converter)) { return NULL; } diff --git a/src/core/python2js.c b/src/core/python2js.c index 61b2d0619..a35c20644 100644 --- a/src/core/python2js.c +++ b/src/core/python2js.c @@ -688,16 +688,16 @@ to_js(PyObject* self, // default_converter. // :to_js - name of this function for error messages static struct _PyArg_Parser _parser = { "O|$ipOOO:to_js", _keywords, 0 }; - if (kwnames != NULL && !_PyArg_ParseStackAndKeywords(args, - nargs, - kwnames, - &_parser, - &obj, - &depth, - &create_proxies, - &pyproxies, - &py_dict_converter, - &py_default_converter)) { + if (!_PyArg_ParseStackAndKeywords(args, + nargs, + kwnames, + &_parser, + &obj, + &depth, + &create_proxies, + &pyproxies, + &py_dict_converter, + &py_default_converter)) { return NULL; }