mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 18:51:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 21

merge

Browse source
This commit is contained in:
Raymond Hettinger 2013-10-01 01:00:59 -07:00
commit c13516b0a0
4 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Objects/typeobject.c
View file

@ -49,9 +49,6 @@ _Py_IDENTIFIER(__module__);
_Py_IDENTIFIER(__name__);
_Py_IDENTIFIER(__new__);
static PyObject *
_PyType_LookupId(PyTypeObject *type, struct _Py_Identifier *name);
static PyObject *
slot_tp_new(PyTypeObject *type, PyObject *args, PyObject *kwds);
@ -2620,7 +2617,7 @@ _PyType_Lookup(PyTypeObject *type, PyObject *name)
return res;
}
static PyObject *
PyObject *
_PyType_LookupId(PyTypeObject *type, struct _Py_Identifier *name)
{
PyObject *oname;