fix: _PyArg_UnpackKeywords API is removed, use PyArg_ParseTupleAndKeywords instead

Author: Xmader

include/JSArrayProxy.hh

@@ -251,11 +251,10 @@ public:
    *
    * @param self - The JSArrayProxy
    * @param args - arguments to the sort method (not used)
-   * @param nargs - number of arguments to the sort method
-   * @param kwnames - keyword arguments to the sort method (reverse=True|False, key=keyfunction)
+   * @param kwargs - keyword arguments to the sort method (reverse=True|False, key=keyfunction)
    * @return PyObject* NULL on exception, None otherwise
    */
-  static PyObject *JSArrayProxy_sort(JSArrayProxy *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames);
+  static PyObject *JSArrayProxy_sort(JSArrayProxy *self, PyObject *args, PyObject *kwargs);
 
   /**
    * @brief tp_traverse
@@ -404,7 +403,7 @@ static PyMethodDef JSArrayProxy_methods[] = {
   {"index", (PyCFunction)JSArrayProxyMethodDefinitions::JSArrayProxy_index, METH_FASTCALL, list_index__doc__},
   {"count", (PyCFunction)JSArrayProxyMethodDefinitions::JSArrayProxy_count, METH_O, list_count__doc__},
   {"reverse", (PyCFunction)JSArrayProxyMethodDefinitions::JSArrayProxy_reverse, METH_NOARGS, list_reverse__doc__},
-  {"sort", (PyCFunction)JSArrayProxyMethodDefinitions::JSArrayProxy_sort, METH_FASTCALL|METH_KEYWORDS, list_sort__doc__},
+  {"sort", (PyCFunction)JSArrayProxyMethodDefinitions::JSArrayProxy_sort, METH_VARARGS|METH_KEYWORDS, list_sort__doc__},
   {NULL, NULL}                       /* sentinel */
 };
 

src/JSArrayProxy.cc

@@ -1180,43 +1180,15 @@ static bool sort_compare_default(JSContext *cx, unsigned argc, JS::Value *vp) {
   return true;
 }
 
-PyObject *JSArrayProxyMethodDefinitions::JSArrayProxy_sort(JSArrayProxy *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames) {
+PyObject *JSArrayProxyMethodDefinitions::JSArrayProxy_sort(JSArrayProxy *self, PyObject *args, PyObject *kwargs) {
   static const char *const _keywords[] = {"key", "reverse", NULL};
-  static _PyArg_Parser _parser = {
-    .keywords = _keywords,
-    .fname = "sort",
-    .kwtuple = NULL,
-  };
-
-  PyObject *argsbuf[2];
-  Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 0;
+
   PyObject *keyfunc = Py_None;
   int reverse = 0;
-
-  // args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 0, 0, 0, argsbuf);
-  Py_RETURN_NONE;
-
-  if (!args) {
-    return NULL;
-  }
-
-  if (!noptargs) {
-    goto skip_optional_kwonly;
-  }
-
-  if (args[0]) {
-    keyfunc = args[0];
-    if (!--noptargs) {
-      goto skip_optional_kwonly;
-    }
-  }
-
-  reverse = PyObject_IsTrue(args[1]);
-  if (reverse < 0) {
+  if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|$Op:sort", _keywords, &keyfunc, &reverse)) {
     return NULL;
   }
 
-skip_optional_kwonly:
   if (JSArrayProxy_length(self) > 1) {
     JS::RootedValue jReturnedArray(GLOBAL_CX);
     if (keyfunc != Py_None) {