https://github.com/python/cpython/commit/ecb4a2b711d62f1395ddbff52576d0cca8a1b43e
commit: ecb4a2b711d62f1395ddbff52576d0cca8a1b43e
branch: main
author: Victor Stinner <vstin...@python.org>
committer: vstinner <vstin...@python.org>
date: 2024-03-18T22:03:55+01:00
summary:
gh-116417: Move limited C API list.c tests to _testlimitedcapi (#116602)
Split list.c and set.c tests of _testcapi into two parts: limited C
API tests in _testlimitedcapi and non-limited C API tests in
_testcapi.
files:
A Modules/_testlimitedcapi/list.c
A Modules/_testlimitedcapi/set.c
M Lib/test/test_capi/test_list.py
M Lib/test/test_capi/test_set.py
M Modules/Setup.stdlib.in
M Modules/_testcapi/list.c
M Modules/_testcapi/set.c
M Modules/_testlimitedcapi.c
M Modules/_testlimitedcapi/parts.h
M PCbuild/_testlimitedcapi.vcxproj
M PCbuild/_testlimitedcapi.vcxproj.filters
diff --git a/Lib/test/test_capi/test_list.py b/Lib/test/test_capi/test_list.py
index dceb4fce3c077b..0896a971f5c727 100644
--- a/Lib/test/test_capi/test_list.py
+++ b/Lib/test/test_capi/test_list.py
@@ -4,6 +4,7 @@
from test.support import import_helper
from collections import UserList
_testcapi = import_helper.import_module('_testcapi')
+_testlimitedcapi = import_helper.import_module('_testlimitedcapi')
NULL = None
PY_SSIZE_T_MIN = _testcapi.PY_SSIZE_T_MIN
@@ -25,7 +26,7 @@ def __del__(self):
class CAPITest(unittest.TestCase):
def test_check(self):
# Test PyList_Check()
- check = _testcapi.list_check
+ check = _testlimitedcapi.list_check
self.assertTrue(check([1, 2]))
self.assertTrue(check([]))
self.assertTrue(check(ListSubclass([1, 2])))
@@ -39,7 +40,7 @@ def test_check(self):
def test_list_check_exact(self):
# Test PyList_CheckExact()
- check = _testcapi.list_check_exact
+ check = _testlimitedcapi.list_check_exact
self.assertTrue(check([1]))
self.assertTrue(check([]))
self.assertFalse(check(ListSubclass([1])))
@@ -51,7 +52,7 @@ def test_list_check_exact(self):
def test_list_new(self):
# Test PyList_New()
- list_new = _testcapi.list_new
+ list_new = _testlimitedcapi.list_new
lst = list_new(0)
self.assertEqual(lst, [])
self.assertIs(type(lst), list)
@@ -62,7 +63,7 @@ def test_list_new(self):
def test_list_size(self):
# Test PyList_Size()
- size = _testcapi.list_size
+ size = _testlimitedcapi.list_size
self.assertEqual(size([1, 2]), 2)
self.assertEqual(size(ListSubclass([1, 2])), 2)
self.assertRaises(SystemError, size, UserList())
@@ -98,11 +99,11 @@ def check_list_get_item(self, getitem, exctype):
def test_list_getitem(self):
# Test PyList_GetItem()
- self.check_list_get_item(_testcapi.list_getitem, SystemError)
+ self.check_list_get_item(_testlimitedcapi.list_getitem, SystemError)
def test_list_get_item_ref(self):
# Test PyList_GetItemRef()
- self.check_list_get_item(_testcapi.list_get_item_ref, TypeError)
+ self.check_list_get_item(_testlimitedcapi.list_get_item_ref, TypeError)
def test_list_get_item(self):
# Test PyList_GET_ITEM()
@@ -119,7 +120,7 @@ def test_list_get_item(self):
def test_list_setitem(self):
# Test PyList_SetItem()
- setitem = _testcapi.list_setitem
+ setitem = _testlimitedcapi.list_setitem
lst = [1, 2, 3]
setitem(lst, 0, 10)
self.assertEqual(lst, [10, 2, 3])
@@ -151,7 +152,7 @@ def test_list_set_item(self):
def test_list_insert(self):
# Test PyList_Insert()
- insert = _testcapi.list_insert
+ insert = _testlimitedcapi.list_insert
lst = [1, 2, 3]
insert(lst, 0, 23)
self.assertEqual(lst, [23, 1, 2, 3])
@@ -173,7 +174,7 @@ def test_list_insert(self):
def test_list_append(self):
# Test PyList_Append()
- append = _testcapi.list_append
+ append = _testlimitedcapi.list_append
lst = [1, 2, 3]
append(lst, 10)
self.assertEqual(lst, [1, 2, 3, 10])
@@ -186,7 +187,7 @@ def test_list_append(self):
def test_list_getslice(self):
# Test PyList_GetSlice()
- getslice = _testcapi.list_getslice
+ getslice = _testlimitedcapi.list_getslice
lst = [1, 2, 3]
# empty
@@ -210,7 +211,7 @@ def test_list_getslice(self):
def test_list_setslice(self):
# Test PyList_SetSlice()
- list_setslice = _testcapi.list_setslice
+ list_setslice = _testlimitedcapi.list_setslice
def set_slice(lst, low, high, value):
lst = lst.copy()
self.assertEqual(list_setslice(lst, low, high, value), 0)
@@ -265,7 +266,7 @@ def set_slice(lst, low, high, value):
def test_list_sort(self):
# Test PyList_Sort()
- sort = _testcapi.list_sort
+ sort = _testlimitedcapi.list_sort
lst = [4, 6, 7, 3, 1, 5, 9, 2, 0, 8]
sort(lst)
self.assertEqual(lst, list(range(10)))
@@ -281,7 +282,7 @@ def test_list_sort(self):
def test_list_reverse(self):
# Test PyList_Reverse()
- reverse = _testcapi.list_reverse
+ reverse = _testlimitedcapi.list_reverse
def list_reverse(lst):
self.assertEqual(reverse(lst), 0)
return lst
@@ -295,7 +296,7 @@ def list_reverse(lst):
def test_list_astuple(self):
# Test PyList_AsTuple()
- astuple = _testcapi.list_astuple
+ astuple = _testlimitedcapi.list_astuple
self.assertEqual(astuple([]), ())
self.assertEqual(astuple([2, 5, 10]), (2, 5, 10))
diff --git a/Lib/test/test_capi/test_set.py b/Lib/test/test_capi/test_set.py
index 5235f81543e0b6..499a5148d782ab 100644
--- a/Lib/test/test_capi/test_set.py
+++ b/Lib/test/test_capi/test_set.py
@@ -2,8 +2,10 @@
from test.support import import_helper
-# Skip this test if the _testcapi or _testinternalcapi modules aren't
available.
+# Skip this test if the _testcapi, _testlimitedcapi or _testinternalcapi
+# modules aren't available.
_testcapi = import_helper.import_module('_testcapi')
+_testlimitedcapi = import_helper.import_module('_testlimitedcapi')
_testinternalcapi = import_helper.import_module('_testinternalcapi')
class set_subclass(set):
@@ -23,7 +25,7 @@ def assertImmutable(self, action, *args):
class TestSetCAPI(BaseSetTests, unittest.TestCase):
def test_set_check(self):
- check = _testcapi.set_check
+ check = _testlimitedcapi.set_check
self.assertTrue(check(set()))
self.assertTrue(check({1, 2}))
self.assertFalse(check(frozenset()))
@@ -33,7 +35,7 @@ def test_set_check(self):
# CRASHES: check(NULL)
def test_set_check_exact(self):
- check = _testcapi.set_checkexact
+ check = _testlimitedcapi.set_checkexact
self.assertTrue(check(set()))
self.assertTrue(check({1, 2}))
self.assertFalse(check(frozenset()))
@@ -43,7 +45,7 @@ def test_set_check_exact(self):
# CRASHES: check(NULL)
def test_frozenset_check(self):
- check = _testcapi.frozenset_check
+ check = _testlimitedcapi.frozenset_check
self.assertFalse(check(set()))
self.assertTrue(check(frozenset()))
self.assertTrue(check(frozenset({1, 2})))
@@ -53,7 +55,7 @@ def test_frozenset_check(self):
# CRASHES: check(NULL)
def test_frozenset_check_exact(self):
- check = _testcapi.frozenset_checkexact
+ check = _testlimitedcapi.frozenset_checkexact
self.assertFalse(check(set()))
self.assertTrue(check(frozenset()))
self.assertTrue(check(frozenset({1, 2})))
@@ -63,7 +65,7 @@ def test_frozenset_check_exact(self):
# CRASHES: check(NULL)
def test_anyset_check(self):
- check = _testcapi.anyset_check
+ check = _testlimitedcapi.anyset_check
self.assertTrue(check(set()))
self.assertTrue(check({1, 2}))
self.assertTrue(check(frozenset()))
@@ -74,7 +76,7 @@ def test_anyset_check(self):
# CRASHES: check(NULL)
def test_anyset_check_exact(self):
- check = _testcapi.anyset_checkexact
+ check = _testlimitedcapi.anyset_checkexact
self.assertTrue(check(set()))
self.assertTrue(check({1, 2}))
self.assertTrue(check(frozenset()))
@@ -85,7 +87,7 @@ def test_anyset_check_exact(self):
# CRASHES: check(NULL)
def test_set_new(self):
- set_new = _testcapi.set_new
+ set_new = _testlimitedcapi.set_new
self.assertEqual(set_new().__class__, set)
self.assertEqual(set_new(), set())
self.assertEqual(set_new((1, 1, 2)), {1, 2})
@@ -98,7 +100,7 @@ def test_set_new(self):
set_new((1, {}))
def test_frozenset_new(self):
- frozenset_new = _testcapi.frozenset_new
+ frozenset_new = _testlimitedcapi.frozenset_new
self.assertEqual(frozenset_new().__class__, frozenset)
self.assertEqual(frozenset_new(), frozenset())
self.assertEqual(frozenset_new((1, 1, 2)), frozenset({1, 2}))
@@ -111,7 +113,7 @@ def test_frozenset_new(self):
frozenset_new((1, {}))
def test_set_size(self):
- get_size = _testcapi.set_size
+ get_size = _testlimitedcapi.set_size
self.assertEqual(get_size(set()), 0)
self.assertEqual(get_size(frozenset()), 0)
self.assertEqual(get_size({1, 1, 2}), 2)
@@ -134,7 +136,7 @@ def test_set_get_size(self):
# CRASHES: get_size(object())
def test_set_contains(self):
- contains = _testcapi.set_contains
+ contains = _testlimitedcapi.set_contains
for cls in (set, frozenset, set_subclass, frozenset_subclass):
with self.subTest(cls=cls):
instance = cls((1, 2))
@@ -147,7 +149,7 @@ def test_set_contains(self):
# CRASHES: contains(NULL, NULL)
def test_add(self):
- add = _testcapi.set_add
+ add = _testlimitedcapi.set_add
for cls in (set, set_subclass):
with self.subTest(cls=cls):
instance = cls((1, 2))
@@ -165,7 +167,7 @@ def test_add(self):
# CRASHES: add(NULL, NULL)
def test_discard(self):
- discard = _testcapi.set_discard
+ discard = _testlimitedcapi.set_discard
for cls in (set, set_subclass):
with self.subTest(cls=cls):
instance = cls((1, 2))
@@ -187,7 +189,7 @@ def test_discard(self):
# CRASHES: discard(NULL, NULL)
def test_pop(self):
- pop = _testcapi.set_pop
+ pop = _testlimitedcapi.set_pop
orig = (1, 2)
for cls in (set, set_subclass):
with self.subTest(cls=cls):
@@ -204,7 +206,7 @@ def test_pop(self):
# CRASHES: pop(NULL)
def test_clear(self):
- clear = _testcapi.set_clear
+ clear = _testlimitedcapi.set_clear
for cls in (set, set_subclass):
with self.subTest(cls=cls):
instance = cls((1, 2))
diff --git a/Modules/Setup.stdlib.in b/Modules/Setup.stdlib.in
index deada66cf1a807..d4743d31b465a9 100644
--- a/Modules/Setup.stdlib.in
+++ b/Modules/Setup.stdlib.in
@@ -163,7 +163,7 @@
@MODULE__TESTBUFFER_TRUE@_testbuffer _testbuffer.c
@MODULE__TESTINTERNALCAPI_TRUE@_testinternalcapi _testinternalcapi.c
_testinternalcapi/test_lock.c _testinternalcapi/pytime.c
_testinternalcapi/set.c _testinternalcapi/test_critical_sections.c
@MODULE__TESTCAPI_TRUE@_testcapi _testcapimodule.c _testcapi/vectorcall.c
_testcapi/heaptype.c _testcapi/abstract.c _testcapi/unicode.c _testcapi/dict.c
_testcapi/set.c _testcapi/list.c _testcapi/tuple.c _testcapi/getargs.c
_testcapi/datetime.c _testcapi/docstring.c _testcapi/mem.c _testcapi/watchers.c
_testcapi/long.c _testcapi/float.c _testcapi/complex.c _testcapi/numbers.c
_testcapi/structmember.c _testcapi/exceptions.c _testcapi/code.c
_testcapi/buffer.c _testcapi/pyatomic.c _testcapi/file.c _testcapi/codec.c
_testcapi/immortal.c _testcapi/gc.c _testcapi/hash.c _testcapi/time.c
-@MODULE__TESTLIMITEDCAPI_TRUE@_testlimitedcapi _testlimitedcapi.c
_testlimitedcapi/bytearray.c _testlimitedcapi/bytes.c
_testlimitedcapi/heaptype_relative.c _testlimitedcapi/pyos.c
_testlimitedcapi/sys.c _testlimitedcapi/vectorcall_limited.c
+@MODULE__TESTLIMITEDCAPI_TRUE@_testlimitedcapi _testlimitedcapi.c
_testlimitedcapi/bytearray.c _testlimitedcapi/bytes.c
_testlimitedcapi/heaptype_relative.c _testlimitedcapi/list.c
_testlimitedcapi/pyos.c _testlimitedcapi/set.c _testlimitedcapi/sys.c
_testlimitedcapi/vectorcall_limited.c
@MODULE__TESTCLINIC_TRUE@_testclinic _testclinic.c
@MODULE__TESTCLINIC_LIMITED_TRUE@_testclinic_limited _testclinic_limited.c
diff --git a/Modules/_testcapi/list.c b/Modules/_testcapi/list.c
index 2cb6499e28336d..09cec4c30c8c36 100644
--- a/Modules/_testcapi/list.c
+++ b/Modules/_testcapi/list.c
@@ -1,32 +1,6 @@
#include "parts.h"
#include "util.h"
-static PyObject *
-list_check(PyObject* Py_UNUSED(module), PyObject *obj)
-{
- NULLABLE(obj);
- return PyLong_FromLong(PyList_Check(obj));
-}
-
-static PyObject *
-list_check_exact(PyObject* Py_UNUSED(module), PyObject *obj)
-{
- NULLABLE(obj);
- return PyLong_FromLong(PyList_CheckExact(obj));
-}
-
-static PyObject *
-list_new(PyObject* Py_UNUSED(module), PyObject *obj)
-{
- return PyList_New(PyLong_AsSsize_t(obj));
-}
-
-static PyObject *
-list_size(PyObject *Py_UNUSED(module), PyObject *obj)
-{
- NULLABLE(obj);
- RETURN_SIZE(PyList_Size(obj));
-}
static PyObject *
list_get_size(PyObject *Py_UNUSED(module), PyObject *obj)
@@ -35,17 +9,6 @@ list_get_size(PyObject *Py_UNUSED(module), PyObject *obj)
RETURN_SIZE(PyList_GET_SIZE(obj));
}
-static PyObject *
-list_getitem(PyObject *Py_UNUSED(module), PyObject *args)
-{
- PyObject *obj;
- Py_ssize_t i;
- if (!PyArg_ParseTuple(args, "On", &obj, &i)) {
- return NULL;
- }
- NULLABLE(obj);
- return Py_XNewRef(PyList_GetItem(obj, i));
-}
static PyObject *
list_get_item(PyObject *Py_UNUSED(module), PyObject *args)
@@ -59,31 +22,6 @@ list_get_item(PyObject *Py_UNUSED(module), PyObject *args)
return Py_XNewRef(PyList_GET_ITEM(obj, i));
}
-static PyObject *
-list_get_item_ref(PyObject *Py_UNUSED(module), PyObject *args)
-{
- PyObject *obj;
- Py_ssize_t i;
- if (!PyArg_ParseTuple(args, "On", &obj, &i)) {
- return NULL;
- }
- NULLABLE(obj);
- return PyList_GetItemRef(obj, i);
-}
-
-static PyObject *
-list_setitem(PyObject *Py_UNUSED(module), PyObject *args)
-{
- PyObject *obj, *value;
- Py_ssize_t i;
- if (!PyArg_ParseTuple(args, "OnO", &obj, &i, &value)) {
- return NULL;
- }
- NULLABLE(obj);
- NULLABLE(value);
- RETURN_INT(PyList_SetItem(obj, i, Py_XNewRef(value)));
-
-}
static PyObject *
list_set_item(PyObject *Py_UNUSED(module), PyObject *args)
@@ -100,79 +38,6 @@ list_set_item(PyObject *Py_UNUSED(module), PyObject *args)
}
-static PyObject *
-list_insert(PyObject *Py_UNUSED(module), PyObject *args)
-{
- PyObject *obj, *value;
- Py_ssize_t where;
- if (!PyArg_ParseTuple(args, "OnO", &obj, &where, &value)) {
- return NULL;
- }
- NULLABLE(obj);
- NULLABLE(value);
- RETURN_INT(PyList_Insert(obj, where, Py_XNewRef(value)));
-
-}
-
-static PyObject *
-list_append(PyObject *Py_UNUSED(module), PyObject *args)
-{
- PyObject *obj, *value;
- if (!PyArg_ParseTuple(args, "OO", &obj, &value)) {
- return NULL;
- }
- NULLABLE(obj);
- NULLABLE(value);
- RETURN_INT(PyList_Append(obj, value));
-}
-
-static PyObject *
-list_getslice(PyObject *Py_UNUSED(module), PyObject *args)
-{
- PyObject *obj;
- Py_ssize_t ilow, ihigh;
- if (!PyArg_ParseTuple(args, "Onn", &obj, &ilow, &ihigh)) {
- return NULL;
- }
- NULLABLE(obj);
- return PyList_GetSlice(obj, ilow, ihigh);
-
-}
-
-static PyObject *
-list_setslice(PyObject *Py_UNUSED(module), PyObject *args)
-{
- PyObject *obj, *value;
- Py_ssize_t ilow, ihigh;
- if (!PyArg_ParseTuple(args, "OnnO", &obj, &ilow, &ihigh, &value)) {
- return NULL;
- }
- NULLABLE(obj);
- NULLABLE(value);
- RETURN_INT(PyList_SetSlice(obj, ilow, ihigh, value));
-}
-
-static PyObject *
-list_sort(PyObject* Py_UNUSED(module), PyObject *obj)
-{
- NULLABLE(obj);
- RETURN_INT(PyList_Sort(obj));
-}
-
-static PyObject *
-list_reverse(PyObject* Py_UNUSED(module), PyObject *obj)
-{
- NULLABLE(obj);
- RETURN_INT(PyList_Reverse(obj));
-}
-
-static PyObject *
-list_astuple(PyObject* Py_UNUSED(module), PyObject *obj)
-{
- NULLABLE(obj);
- return PyList_AsTuple(obj);
-}
-
static PyObject *
list_clear(PyObject* Py_UNUSED(module), PyObject *obj)
@@ -196,25 +61,12 @@ list_extend(PyObject* Py_UNUSED(module), PyObject *args)
static PyMethodDef test_methods[] = {
- {"list_check", list_check, METH_O},
- {"list_check_exact", list_check_exact, METH_O},
- {"list_new", list_new, METH_O},
- {"list_size", list_size, METH_O},
{"list_get_size", list_get_size, METH_O},
- {"list_getitem", list_getitem, METH_VARARGS},
{"list_get_item", list_get_item, METH_VARARGS},
- {"list_get_item_ref", list_get_item_ref, METH_VARARGS},
- {"list_setitem", list_setitem, METH_VARARGS},
{"list_set_item", list_set_item, METH_VARARGS},
- {"list_insert", list_insert, METH_VARARGS},
- {"list_append", list_append, METH_VARARGS},
- {"list_getslice", list_getslice, METH_VARARGS},
- {"list_setslice", list_setslice, METH_VARARGS},
- {"list_sort", list_sort, METH_O},
- {"list_reverse", list_reverse, METH_O},
- {"list_astuple", list_astuple, METH_O},
{"list_clear", list_clear, METH_O},
{"list_extend", list_extend, METH_VARARGS},
+
{NULL},
};
diff --git a/Modules/_testcapi/set.c b/Modules/_testcapi/set.c
index 2fbd0aeffcd9f9..31b52cee5e9623 100644
--- a/Modules/_testcapi/set.c
+++ b/Modules/_testcapi/set.c
@@ -1,75 +1,6 @@
#include "parts.h"
#include "util.h"
-static PyObject *
-set_check(PyObject *self, PyObject *obj)
-{
- NULLABLE(obj);
- RETURN_INT(PySet_Check(obj));
-}
-
-static PyObject *
-set_checkexact(PyObject *self, PyObject *obj)
-{
- NULLABLE(obj);
- RETURN_INT(PySet_CheckExact(obj));
-}
-
-static PyObject *
-frozenset_check(PyObject *self, PyObject *obj)
-{
- NULLABLE(obj);
- RETURN_INT(PyFrozenSet_Check(obj));
-}
-
-static PyObject *
-frozenset_checkexact(PyObject *self, PyObject *obj)
-{
- NULLABLE(obj);
- RETURN_INT(PyFrozenSet_CheckExact(obj));
-}
-
-static PyObject *
-anyset_check(PyObject *self, PyObject *obj)
-{
- NULLABLE(obj);
- RETURN_INT(PyAnySet_Check(obj));
-}
-
-static PyObject *
-anyset_checkexact(PyObject *self, PyObject *obj)
-{
- NULLABLE(obj);
- RETURN_INT(PyAnySet_CheckExact(obj));
-}
-
-static PyObject *
-set_new(PyObject *self, PyObject *args)
-{
- PyObject *iterable = NULL;
- if (!PyArg_ParseTuple(args, "|O", &iterable)) {
- return NULL;
- }
- return PySet_New(iterable);
-}
-
-static PyObject *
-frozenset_new(PyObject *self, PyObject *args)
-{
- PyObject *iterable = NULL;
- if (!PyArg_ParseTuple(args, "|O", &iterable)) {
- return NULL;
- }
- return PyFrozenSet_New(iterable);
-}
-
-static PyObject *
-set_size(PyObject *self, PyObject *obj)
-{
- NULLABLE(obj);
- RETURN_SIZE(PySet_Size(obj));
-}
-
static PyObject *
set_get_size(PyObject *self, PyObject *obj)
{
@@ -77,111 +8,8 @@ set_get_size(PyObject *self, PyObject *obj)
RETURN_SIZE(PySet_GET_SIZE(obj));
}
-static PyObject *
-set_contains(PyObject *self, PyObject *args)
-{
- PyObject *obj, *item;
- if (!PyArg_ParseTuple(args, "OO", &obj, &item)) {
- return NULL;
- }
- NULLABLE(obj);
- NULLABLE(item);
- RETURN_INT(PySet_Contains(obj, item));
-}
-
-static PyObject *
-set_add(PyObject *self, PyObject *args)
-{
- PyObject *obj, *item;
- if (!PyArg_ParseTuple(args, "OO", &obj, &item)) {
- return NULL;
- }
- NULLABLE(obj);
- NULLABLE(item);
- RETURN_INT(PySet_Add(obj, item));
-}
-
-static PyObject *
-set_discard(PyObject *self, PyObject *args)
-{
- PyObject *obj, *item;
- if (!PyArg_ParseTuple(args, "OO", &obj, &item)) {
- return NULL;
- }
- NULLABLE(obj);
- NULLABLE(item);
- RETURN_INT(PySet_Discard(obj, item));
-}
-
-static PyObject *
-set_pop(PyObject *self, PyObject *obj)
-{
- NULLABLE(obj);
- return PySet_Pop(obj);
-}
-
-static PyObject *
-set_clear(PyObject *self, PyObject *obj)
-{
- NULLABLE(obj);
- RETURN_INT(PySet_Clear(obj));
-}
-
-static PyObject *
-test_frozenset_add_in_capi(PyObject *self, PyObject *Py_UNUSED(obj))
-{
- // Test that `frozenset` can be used with `PySet_Add`,
- // when frozenset is just created in CAPI.
- PyObject *fs = PyFrozenSet_New(NULL);
- if (fs == NULL) {
- return NULL;
- }
- PyObject *num = PyLong_FromLong(1);
- if (num == NULL) {
- goto error;
- }
- if (PySet_Add(fs, num) < 0) {
- goto error;
- }
- int contains = PySet_Contains(fs, num);
- if (contains < 0) {
- goto error;
- }
- else if (contains == 0) {
- goto unexpected;
- }
- Py_DECREF(fs);
- Py_DECREF(num);
- Py_RETURN_NONE;
-
-unexpected:
- PyErr_SetString(PyExc_ValueError, "set does not contain expected value");
-error:
- Py_DECREF(fs);
- Py_XDECREF(num);
- return NULL;
-}
-
static PyMethodDef test_methods[] = {
- {"set_check", set_check, METH_O},
- {"set_checkexact", set_checkexact, METH_O},
- {"frozenset_check", frozenset_check, METH_O},
- {"frozenset_checkexact", frozenset_checkexact, METH_O},
- {"anyset_check", anyset_check, METH_O},
- {"anyset_checkexact", anyset_checkexact, METH_O},
-
- {"set_new", set_new, METH_VARARGS},
- {"frozenset_new", frozenset_new, METH_VARARGS},
-
- {"set_size", set_size, METH_O},
{"set_get_size", set_get_size, METH_O},
- {"set_contains", set_contains, METH_VARARGS},
- {"set_add", set_add, METH_VARARGS},
- {"set_discard", set_discard, METH_VARARGS},
- {"set_pop", set_pop, METH_O},
- {"set_clear", set_clear, METH_O},
-
- {"test_frozenset_add_in_capi", test_frozenset_add_in_capi, METH_NOARGS},
{NULL},
};
diff --git a/Modules/_testlimitedcapi.c b/Modules/_testlimitedcapi.c
index 49bf6a3ea39613..a25b0aa2de7c99 100644
--- a/Modules/_testlimitedcapi.c
+++ b/Modules/_testlimitedcapi.c
@@ -35,9 +35,15 @@ PyInit__testlimitedcapi(void)
if (_PyTestCapi_Init_HeaptypeRelative(mod) < 0) {
return NULL;
}
+ if (_PyTestCapi_Init_List(mod) < 0) {
+ return NULL;
+ }
if (_PyTestCapi_Init_PyOS(mod) < 0) {
return NULL;
}
+ if (_PyTestCapi_Init_Set(mod) < 0) {
+ return NULL;
+ }
if (_PyTestCapi_Init_Sys(mod) < 0) {
return NULL;
}
diff --git a/Modules/_testlimitedcapi/list.c b/Modules/_testlimitedcapi/list.c
new file mode 100644
index 00000000000000..0917900da390ce
--- /dev/null
+++ b/Modules/_testlimitedcapi/list.c
@@ -0,0 +1,169 @@
+#include "parts.h"
+#include "util.h"
+
+static PyObject *
+list_check(PyObject* Py_UNUSED(module), PyObject *obj)
+{
+ NULLABLE(obj);
+ return PyLong_FromLong(PyList_Check(obj));
+}
+
+static PyObject *
+list_check_exact(PyObject* Py_UNUSED(module), PyObject *obj)
+{
+ NULLABLE(obj);
+ return PyLong_FromLong(PyList_CheckExact(obj));
+}
+
+static PyObject *
+list_new(PyObject* Py_UNUSED(module), PyObject *obj)
+{
+ return PyList_New(PyLong_AsSsize_t(obj));
+}
+
+static PyObject *
+list_size(PyObject *Py_UNUSED(module), PyObject *obj)
+{
+ NULLABLE(obj);
+ RETURN_SIZE(PyList_Size(obj));
+}
+
+static PyObject *
+list_getitem(PyObject *Py_UNUSED(module), PyObject *args)
+{
+ PyObject *obj;
+ Py_ssize_t i;
+ if (!PyArg_ParseTuple(args, "On", &obj, &i)) {
+ return NULL;
+ }
+ NULLABLE(obj);
+ return Py_XNewRef(PyList_GetItem(obj, i));
+}
+
+static PyObject *
+list_get_item_ref(PyObject *Py_UNUSED(module), PyObject *args)
+{
+ PyObject *obj;
+ Py_ssize_t i;
+ if (!PyArg_ParseTuple(args, "On", &obj, &i)) {
+ return NULL;
+ }
+ NULLABLE(obj);
+ return PyList_GetItemRef(obj, i);
+}
+
+static PyObject *
+list_setitem(PyObject *Py_UNUSED(module), PyObject *args)
+{
+ PyObject *obj, *value;
+ Py_ssize_t i;
+ if (!PyArg_ParseTuple(args, "OnO", &obj, &i, &value)) {
+ return NULL;
+ }
+ NULLABLE(obj);
+ NULLABLE(value);
+ RETURN_INT(PyList_SetItem(obj, i, Py_XNewRef(value)));
+
+}
+
+static PyObject *
+list_insert(PyObject *Py_UNUSED(module), PyObject *args)
+{
+ PyObject *obj, *value;
+ Py_ssize_t where;
+ if (!PyArg_ParseTuple(args, "OnO", &obj, &where, &value)) {
+ return NULL;
+ }
+ NULLABLE(obj);
+ NULLABLE(value);
+ RETURN_INT(PyList_Insert(obj, where, Py_XNewRef(value)));
+
+}
+
+static PyObject *
+list_append(PyObject *Py_UNUSED(module), PyObject *args)
+{
+ PyObject *obj, *value;
+ if (!PyArg_ParseTuple(args, "OO", &obj, &value)) {
+ return NULL;
+ }
+ NULLABLE(obj);
+ NULLABLE(value);
+ RETURN_INT(PyList_Append(obj, value));
+}
+
+static PyObject *
+list_getslice(PyObject *Py_UNUSED(module), PyObject *args)
+{
+ PyObject *obj;
+ Py_ssize_t ilow, ihigh;
+ if (!PyArg_ParseTuple(args, "Onn", &obj, &ilow, &ihigh)) {
+ return NULL;
+ }
+ NULLABLE(obj);
+ return PyList_GetSlice(obj, ilow, ihigh);
+
+}
+
+static PyObject *
+list_setslice(PyObject *Py_UNUSED(module), PyObject *args)
+{
+ PyObject *obj, *value;
+ Py_ssize_t ilow, ihigh;
+ if (!PyArg_ParseTuple(args, "OnnO", &obj, &ilow, &ihigh, &value)) {
+ return NULL;
+ }
+ NULLABLE(obj);
+ NULLABLE(value);
+ RETURN_INT(PyList_SetSlice(obj, ilow, ihigh, value));
+}
+
+static PyObject *
+list_sort(PyObject* Py_UNUSED(module), PyObject *obj)
+{
+ NULLABLE(obj);
+ RETURN_INT(PyList_Sort(obj));
+}
+
+static PyObject *
+list_reverse(PyObject* Py_UNUSED(module), PyObject *obj)
+{
+ NULLABLE(obj);
+ RETURN_INT(PyList_Reverse(obj));
+}
+
+static PyObject *
+list_astuple(PyObject* Py_UNUSED(module), PyObject *obj)
+{
+ NULLABLE(obj);
+ return PyList_AsTuple(obj);
+}
+
+
+static PyMethodDef test_methods[] = {
+ {"list_check", list_check, METH_O},
+ {"list_check_exact", list_check_exact, METH_O},
+ {"list_new", list_new, METH_O},
+ {"list_size", list_size, METH_O},
+ {"list_getitem", list_getitem, METH_VARARGS},
+ {"list_get_item_ref", list_get_item_ref, METH_VARARGS},
+ {"list_setitem", list_setitem, METH_VARARGS},
+ {"list_insert", list_insert, METH_VARARGS},
+ {"list_append", list_append, METH_VARARGS},
+ {"list_getslice", list_getslice, METH_VARARGS},
+ {"list_setslice", list_setslice, METH_VARARGS},
+ {"list_sort", list_sort, METH_O},
+ {"list_reverse", list_reverse, METH_O},
+ {"list_astuple", list_astuple, METH_O},
+ {NULL},
+};
+
+int
+_PyTestCapi_Init_List(PyObject *m)
+{
+ if (PyModule_AddFunctions(m, test_methods) < 0) {
+ return -1;
+ }
+
+ return 0;
+}
diff --git a/Modules/_testlimitedcapi/parts.h b/Modules/_testlimitedcapi/parts.h
index 9bc52413382eb5..bb867eccbfe5c3 100644
--- a/Modules/_testlimitedcapi/parts.h
+++ b/Modules/_testlimitedcapi/parts.h
@@ -25,7 +25,9 @@
int _PyTestCapi_Init_ByteArray(PyObject *module);
int _PyTestCapi_Init_Bytes(PyObject *module);
int _PyTestCapi_Init_HeaptypeRelative(PyObject *module);
+int _PyTestCapi_Init_List(PyObject *module);
int _PyTestCapi_Init_PyOS(PyObject *module);
+int _PyTestCapi_Init_Set(PyObject *module);
int _PyTestCapi_Init_Sys(PyObject *module);
int _PyTestCapi_Init_VectorcallLimited(PyObject *module);
diff --git a/Modules/_testlimitedcapi/set.c b/Modules/_testlimitedcapi/set.c
new file mode 100644
index 00000000000000..471b515f874473
--- /dev/null
+++ b/Modules/_testlimitedcapi/set.c
@@ -0,0 +1,189 @@
+#include "parts.h"
+#include "util.h"
+
+static PyObject *
+set_check(PyObject *self, PyObject *obj)
+{
+ NULLABLE(obj);
+ RETURN_INT(PySet_Check(obj));
+}
+
+static PyObject *
+set_checkexact(PyObject *self, PyObject *obj)
+{
+ NULLABLE(obj);
+ RETURN_INT(PySet_CheckExact(obj));
+}
+
+static PyObject *
+frozenset_check(PyObject *self, PyObject *obj)
+{
+ NULLABLE(obj);
+ RETURN_INT(PyFrozenSet_Check(obj));
+}
+
+static PyObject *
+frozenset_checkexact(PyObject *self, PyObject *obj)
+{
+ NULLABLE(obj);
+ RETURN_INT(PyFrozenSet_CheckExact(obj));
+}
+
+static PyObject *
+anyset_check(PyObject *self, PyObject *obj)
+{
+ NULLABLE(obj);
+ RETURN_INT(PyAnySet_Check(obj));
+}
+
+static PyObject *
+anyset_checkexact(PyObject *self, PyObject *obj)
+{
+ NULLABLE(obj);
+ RETURN_INT(PyAnySet_CheckExact(obj));
+}
+
+static PyObject *
+set_new(PyObject *self, PyObject *args)
+{
+ PyObject *iterable = NULL;
+ if (!PyArg_ParseTuple(args, "|O", &iterable)) {
+ return NULL;
+ }
+ return PySet_New(iterable);
+}
+
+static PyObject *
+frozenset_new(PyObject *self, PyObject *args)
+{
+ PyObject *iterable = NULL;
+ if (!PyArg_ParseTuple(args, "|O", &iterable)) {
+ return NULL;
+ }
+ return PyFrozenSet_New(iterable);
+}
+
+static PyObject *
+set_size(PyObject *self, PyObject *obj)
+{
+ NULLABLE(obj);
+ RETURN_SIZE(PySet_Size(obj));
+}
+
+static PyObject *
+set_contains(PyObject *self, PyObject *args)
+{
+ PyObject *obj, *item;
+ if (!PyArg_ParseTuple(args, "OO", &obj, &item)) {
+ return NULL;
+ }
+ NULLABLE(obj);
+ NULLABLE(item);
+ RETURN_INT(PySet_Contains(obj, item));
+}
+
+static PyObject *
+set_add(PyObject *self, PyObject *args)
+{
+ PyObject *obj, *item;
+ if (!PyArg_ParseTuple(args, "OO", &obj, &item)) {
+ return NULL;
+ }
+ NULLABLE(obj);
+ NULLABLE(item);
+ RETURN_INT(PySet_Add(obj, item));
+}
+
+static PyObject *
+set_discard(PyObject *self, PyObject *args)
+{
+ PyObject *obj, *item;
+ if (!PyArg_ParseTuple(args, "OO", &obj, &item)) {
+ return NULL;
+ }
+ NULLABLE(obj);
+ NULLABLE(item);
+ RETURN_INT(PySet_Discard(obj, item));
+}
+
+static PyObject *
+set_pop(PyObject *self, PyObject *obj)
+{
+ NULLABLE(obj);
+ return PySet_Pop(obj);
+}
+
+static PyObject *
+set_clear(PyObject *self, PyObject *obj)
+{
+ NULLABLE(obj);
+ RETURN_INT(PySet_Clear(obj));
+}
+
+static PyObject *
+test_frozenset_add_in_capi(PyObject *self, PyObject *Py_UNUSED(obj))
+{
+ // Test that `frozenset` can be used with `PySet_Add`,
+ // when frozenset is just created in CAPI.
+ PyObject *fs = PyFrozenSet_New(NULL);
+ if (fs == NULL) {
+ return NULL;
+ }
+ PyObject *num = PyLong_FromLong(1);
+ if (num == NULL) {
+ goto error;
+ }
+ if (PySet_Add(fs, num) < 0) {
+ goto error;
+ }
+ int contains = PySet_Contains(fs, num);
+ if (contains < 0) {
+ goto error;
+ }
+ else if (contains == 0) {
+ goto unexpected;
+ }
+ Py_DECREF(fs);
+ Py_DECREF(num);
+ Py_RETURN_NONE;
+
+unexpected:
+ PyErr_SetString(PyExc_ValueError, "set does not contain expected value");
+error:
+ Py_DECREF(fs);
+ Py_XDECREF(num);
+ return NULL;
+}
+
+static PyMethodDef test_methods[] = {
+ {"set_check", set_check, METH_O},
+ {"set_checkexact", set_checkexact, METH_O},
+ {"frozenset_check", frozenset_check, METH_O},
+ {"frozenset_checkexact", frozenset_checkexact, METH_O},
+ {"anyset_check", anyset_check, METH_O},
+ {"anyset_checkexact", anyset_checkexact, METH_O},
+
+ {"set_new", set_new, METH_VARARGS},
+ {"frozenset_new", frozenset_new, METH_VARARGS},
+
+ {"set_size", set_size, METH_O},
+ {"set_contains", set_contains, METH_VARARGS},
+ {"set_add", set_add, METH_VARARGS},
+ {"set_discard", set_discard, METH_VARARGS},
+ {"set_pop", set_pop, METH_O},
+ {"set_clear", set_clear, METH_O},
+
+ {"test_frozenset_add_in_capi", test_frozenset_add_in_capi, METH_NOARGS},
+
+ {NULL},
+};
+
+int
+_PyTestCapi_Init_Set(PyObject *m)
+{
+ if (PyModule_AddFunctions(m, test_methods) < 0) {
+ return -1;
+ }
+
+ return 0;
+}
diff --git a/PCbuild/_testlimitedcapi.vcxproj b/PCbuild/_testlimitedcapi.vcxproj
index 1afeacaa93396e..dc2ccca6bad963 100644
--- a/PCbuild/_testlimitedcapi.vcxproj
+++ b/PCbuild/_testlimitedcapi.vcxproj
@@ -97,7 +97,9 @@
<ClCompile Include="..\Modules\_testlimitedcapi\bytearray.c" />
<ClCompile Include="..\Modules\_testlimitedcapi\bytes.c" />
<ClCompile Include="..\Modules\_testlimitedcapi\heaptype_relative.c" />
+ <ClCompile Include="..\Modules\_testlimitedcapi\list.c" />
<ClCompile Include="..\Modules\_testlimitedcapi\pyos.c" />
+ <ClCompile Include="..\Modules\_testlimitedcapi\set.c" />
<ClCompile Include="..\Modules\_testlimitedcapi\sys.c" />
<ClCompile Include="..\Modules\_testlimitedcapi\vectorcall_limited.c" />
</ItemGroup>
diff --git a/PCbuild/_testlimitedcapi.vcxproj.filters
b/PCbuild/_testlimitedcapi.vcxproj.filters
index b3eeb86185c372..33616be32c09b2 100644
--- a/PCbuild/_testlimitedcapi.vcxproj.filters
+++ b/PCbuild/_testlimitedcapi.vcxproj.filters
@@ -12,7 +12,9 @@
<ClCompile Include="..\Modules\_testlimitedcapi\bytearray.c" />
<ClCompile Include="..\Modules\_testlimitedcapi\bytes.c" />
<ClCompile Include="..\Modules\_testlimitedcapi\heaptype_relative.c" />
+ <ClCompile Include="..\Modules\_testlimitedcapi\list.c" />
<ClCompile Include="..\Modules\_testlimitedcapi\pyos.c" />
+ <ClCompile Include="..\Modules\_testlimitedcapi\set.c" />
<ClCompile Include="..\Modules\_testlimitedcapi\sys.c" />
<ClCompile Include="..\Modules\_testlimitedcapi\vectorcall_limited.c" />
<ClCompile Include="..\Modules\_testlimitedcapi.c" />
_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: arch...@mail-archive.com
