mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 17:08:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Revert "[3.11] GH-92678: Expose managed dict clear and visit functions (GH-95246). (#95256)" (#95647)

Browse source 
This reverts commit 7f73194339.
This commit is contained in:
Mark Shannon 2022-08-04 13:03:07 +01:00 • committed by GitHub
parent 2ab560105b
commit 312dab29a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 0 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Include/cpython/dictobject.h
View file

@ -76,6 +76,3 @@ typedef struct {
PyAPI_FUNC(PyObject *) _PyDictView_New(PyObject *, PyTypeObject *);
PyAPI_FUNC(PyObject *) _PyDictView_Intersect(PyObject* self, PyObject *other);
PyAPI_FUNC(int) _PyObject_VisitManagedDict(PyObject *self, visitproc visit, void *arg);
PyAPI_FUNC(void) _PyObject_ClearManagedDict(PyObject *self);

14
Lib/test/test_capi.py
View file

@ -724,20 +724,6 @@ class CAPITest(unittest.TestCase):
with self.subTest(name=name):
self.assertTrue(hasattr(ctypes.pythonapi, name))
def test_clear_managed_dict(self):
class C:
def __init__(self):
self.a = 1
c = C()
_testcapi.clear_managed_dict(c)
self.assertEqual(c.__dict__, {})
c = C()
self.assertEqual(c.__dict__, {'a':1})
_testcapi.clear_managed_dict(c)
self.assertEqual(c.__dict__, {})
class TestPendingCalls(unittest.TestCase):

9
Modules/_testcapimodule.c
View file

@ -6014,14 +6014,6 @@ settrace_to_record(PyObject *self, PyObject *list)
Py_RETURN_NONE;
}
static PyObject *
clear_managed_dict(PyObject *self, PyObject *obj)
{
_PyObject_ClearManagedDict(obj);
Py_RETURN_NONE;
}
static PyObject *negative_dictoffset(PyObject *, PyObject *);
static PyObject *test_buildvalue_issue38913(PyObject *, PyObject *);
static PyObject *getargs_s_hash_int(PyObject *, PyObject *, PyObject*);
@ -6323,7 +6315,6 @@ static PyMethodDef TestMethods[] = {
{"get_feature_macros", get_feature_macros, METH_NOARGS, NULL},
{"test_code_api", test_code_api, METH_NOARGS, NULL},
{"settrace_to_record", settrace_to_record, METH_O, NULL},
{"clear_managed_dict", clear_managed_dict, METH_O, NULL},
{NULL, NULL} /* sentinel */
};

29
Objects/dictobject.c
View file

@ -5583,35 +5583,6 @@ _PyObject_FreeInstanceAttributes(PyObject *self)
free_values(*values_ptr);
}
int
_PyObject_VisitManagedDict(PyObject *self, visitproc visit, void *arg)
{
PyTypeObject *tp = Py_TYPE(self);
if((tp->tp_flags & Py_TPFLAGS_MANAGED_DICT) == 0) {
return 0;
}
assert(tp->tp_dictoffset);
int err = _PyObject_VisitInstanceAttributes(self, visit, arg);
if (err) {
return err;
}
Py_VISIT(*_PyObject_ManagedDictPointer(self));
return 0;
}
void
_PyObject_ClearManagedDict(PyObject *self)
{
PyTypeObject *tp = Py_TYPE(self);
if((tp->tp_flags & Py_TPFLAGS_MANAGED_DICT) == 0) {
return;
}
_PyObject_FreeInstanceAttributes(self);
*_PyObject_ValuesPointer(self) = NULL;
Py_CLEAR(*_PyObject_ManagedDictPointer(self));
}
PyObject *
PyObject_GenericGetDict(PyObject *obj, void *context)
{