mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 04:34:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

#3247 Get rid of Py_FindMethod; use tp_members instead.

Browse source 
Otherwise dir(_sre.SRE_Match) returns an empty list.

First step: handle most occurrences, remove tp_getattr and fill the tp_methods and tp_members slots.
Add some test about attribute access.
This commit is contained in:
Amaury Forgeot d'Arc 2008-07-02 20:50:16 +00:00
parent 4118174315
commit e43d33a4db
13 changed files with 388 additions and 329 deletions
Download patch file Download diff file Expand all files Collapse all files

50
Modules/_tkinter.c
View file

@ -2327,12 +2327,6 @@ Tktt_Repr(PyObject *self)
return PyUnicode_FromString(buf);
}
static PyObject *
Tktt_GetAttr(PyObject *self, char *name)
{
return Py_FindMethod(Tktt_methods, self, name);
}
static PyTypeObject Tktt_Type =
{
PyVarObject_HEAD_INIT(NULL, 0)
@ -2341,7 +2335,7 @@ static PyTypeObject Tktt_Type =
0, /*tp_itemsize */
Tktt_Dealloc, /*tp_dealloc */
0, /*tp_print */
Tktt_GetAttr, /*tp_getattr */
0, /*tp_getattr */
0, /*tp_setattr */
0, /*tp_compare */
Tktt_Repr, /*tp_repr */
@ -2349,6 +2343,20 @@ static PyTypeObject Tktt_Type =
0, /*tp_as_sequence */
0, /*tp_as_mapping */
0, /*tp_hash */
0, /*tp_call*/
0, /*tp_str*/
0, /*tp_getattro*/
0, /*tp_setattro*/
0, /*tp_as_buffer*/
Py_TPFLAGS_DEFAULT, /*tp_flags*/
0, /*tp_doc*/
0, /*tp_traverse*/
0, /*tp_clear*/
0, /*tp_richcompare*/
0, /*tp_weaklistoffset*/
0, /*tp_iter*/
0, /*tp_iternext*/
Tktt_methods, /*tp_methods*/
};
@ -2671,12 +2679,6 @@ Tkapp_Dealloc(PyObject *self)
DisableEventHook();
}
static PyObject *
Tkapp_GetAttr(PyObject *self, char *name)
{
return Py_FindMethod(Tkapp_methods, self, name);
}
static PyTypeObject Tkapp_Type =
{
PyVarObject_HEAD_INIT(NULL, 0)
@ -2685,7 +2687,7 @@ static PyTypeObject Tkapp_Type =
0, /*tp_itemsize */
Tkapp_Dealloc, /*tp_dealloc */
0, /*tp_print */
Tkapp_GetAttr, /*tp_getattr */
0, /*tp_getattr */
0, /*tp_setattr */
0, /*tp_compare */
0, /*tp_repr */
@ -2693,6 +2695,20 @@ static PyTypeObject Tkapp_Type =
0, /*tp_as_sequence */
0, /*tp_as_mapping */
0, /*tp_hash */
0, /*tp_call*/
0, /*tp_str*/
0, /*tp_getattro*/
0, /*tp_setattro*/
0, /*tp_as_buffer*/
Py_TPFLAGS_DEFAULT, /*tp_flags*/
0, /*tp_doc*/
0, /*tp_traverse*/
0, /*tp_clear*/
0, /*tp_richcompare*/
0, /*tp_weaklistoffset*/
0, /*tp_iter*/
0, /*tp_iternext*/
Tkapp_methods, /*tp_methods*/
};
@ -3026,7 +3042,8 @@ PyInit__tkinter(void)
{
PyObject *m, *d, *uexe, *cexe;
Py_TYPE(&Tkapp_Type) = &PyType_Type;
if (PyType_Ready(&Tkapp_Type) < 0)
return NULL;
#ifdef WITH_THREAD
tcl_lock = PyThread_allocate_lock();
@ -3054,7 +3071,8 @@ PyInit__tkinter(void)
PyDict_SetItemString(d, "TkappType", (PyObject *)&Tkapp_Type);
Py_TYPE(&Tktt_Type) = &PyType_Type;
if (PyType_Ready(&Tktt_Type) < 0)
return NULL;
PyDict_SetItemString(d, "TkttType", (PyObject *)&Tktt_Type);
Py_TYPE(&PyTclObject_Type) = &PyType_Type;