Skip to content

Commit 7c03098

Browse files
committed
Revert "refactor: shim for _PyArg_CheckPositional"
This reverts commit d6e4cff.
1 parent d6e4cff commit 7c03098

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

include/pyshim.hh

+3-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ typedef struct {
4343
* Since Python 3.13, `_PyArg_CheckPositional` function became an internal API.
4444
* @see Modified from https://github.com/python/cpython/blob/v3.13.0rc1/Python/getargs.c#L2738-L2780
4545
*/
46-
inline int PyArg_CheckNArgs(const char *name, Py_ssize_t nargs, Py_ssize_t min, Py_ssize_t max) {
46+
#if PY_VERSION_HEX >= 0x030d0000 // Python version is greater than 3.13
47+
inline int _PyArg_CheckPositional(const char *name, Py_ssize_t nargs, Py_ssize_t min, Py_ssize_t max) {
4748
if (nargs < min) {
4849
PyErr_Format(
4950
PyExc_TypeError,
@@ -66,6 +67,7 @@ inline int PyArg_CheckNArgs(const char *name, Py_ssize_t nargs, Py_ssize_t min,
6667

6768
return 1;
6869
}
70+
#endif
6971

7072
/**
7173
* @brief Shim for `_PyDictView_New`.

src/JSArrayProxy.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,7 @@ PyObject *JSArrayProxyMethodDefinitions::JSArrayProxy_insert(JSArrayProxy *self,
790790
Py_ssize_t index;
791791
PyObject *value;
792792

793-
if (!PyArg_CheckNArgs("insert", nargs, 2, 2)) {
793+
if (!_PyArg_CheckPositional("insert", nargs, 2, 2)) {
794794
return NULL;
795795
}
796796

@@ -900,7 +900,7 @@ PyObject *JSArrayProxyMethodDefinitions::JSArrayProxy_extend(JSArrayProxy *self,
900900
PyObject *JSArrayProxyMethodDefinitions::JSArrayProxy_pop(JSArrayProxy *self, PyObject *const *args, Py_ssize_t nargs) {
901901
Py_ssize_t index = -1;
902902

903-
if (!PyArg_CheckNArgs("pop", nargs, 0, 1)) {
903+
if (!_PyArg_CheckPositional("pop", nargs, 0, 1)) {
904904
return NULL;
905905
}
906906

@@ -988,7 +988,7 @@ PyObject *JSArrayProxyMethodDefinitions::JSArrayProxy_index(JSArrayProxy *self,
988988
Py_ssize_t start = 0;
989989
Py_ssize_t stop = PY_SSIZE_T_MAX;
990990

991-
if (!PyArg_CheckNArgs("index", nargs, 1, 3)) {
991+
if (!_PyArg_CheckPositional("index", nargs, 1, 3)) {
992992
return NULL;
993993
}
994994
value = args[0];

src/JSObjectProxy.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@ PyObject *JSObjectProxyMethodDefinitions::JSObjectProxy_get_method(JSObjectProxy
623623
PyObject *key;
624624
PyObject *default_value = Py_None;
625625

626-
if (!PyArg_CheckNArgs("get", nargs, 1, 2)) {
626+
if (!_PyArg_CheckPositional("get", nargs, 1, 2)) {
627627
return NULL;
628628
}
629629
key = args[0];
@@ -647,7 +647,7 @@ PyObject *JSObjectProxyMethodDefinitions::JSObjectProxy_setdefault_method(JSObje
647647
PyObject *key;
648648
PyObject *default_value = Py_None;
649649

650-
if (!PyArg_CheckNArgs("setdefault", nargs, 1, 2)) {
650+
if (!_PyArg_CheckPositional("setdefault", nargs, 1, 2)) {
651651
return NULL;
652652
}
653653
key = args[0];
@@ -679,7 +679,7 @@ PyObject *JSObjectProxyMethodDefinitions::JSObjectProxy_pop_method(JSObjectProxy
679679
PyObject *key;
680680
PyObject *default_value = NULL;
681681

682-
if (!PyArg_CheckNArgs("pop", nargs, 1, 2)) {
682+
if (!_PyArg_CheckPositional("pop", nargs, 1, 2)) {
683683
return NULL;
684684
}
685685
key = args[0];

0 commit comments

Comments
 (0)