Issue #6477: Keep PyNotImplemented_Type and PyNone_Type private.

This commit is contained in:
Alexandre Vassalotti 2013-11-30 17:55:48 -08:00
parent 19b6fa6ebb
commit 65846c6c51
3 changed files with 10 additions and 10 deletions

View file

@ -1459,7 +1459,7 @@ static PyNumberMethods none_as_number = {
0, /* nb_index */
};
PyTypeObject PyNone_Type = {
PyTypeObject _PyNone_Type = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
"NoneType",
0,
@ -1502,7 +1502,7 @@ PyTypeObject PyNone_Type = {
PyObject _Py_NoneStruct = {
_PyObject_EXTRA_INIT
1, &PyNone_Type
1, &_PyNone_Type
};
/* NotImplemented is an object that can be used to signal that an
@ -1524,7 +1524,7 @@ notimplemented_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
Py_RETURN_NOTIMPLEMENTED;
}
PyTypeObject PyNotImplemented_Type = {
PyTypeObject _PyNotImplemented_Type = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
"NotImplementedType",
0,
@ -1567,7 +1567,7 @@ PyTypeObject PyNotImplemented_Type = {
PyObject _Py_NotImplementedStruct = {
_PyObject_EXTRA_INIT
1, &PyNotImplemented_Type
1, &_PyNotImplemented_Type
};
void
@ -1597,10 +1597,10 @@ _Py_ReadyTypes(void)
if (PyType_Ready(&PyList_Type) < 0)
Py_FatalError("Can't initialize list type");
if (PyType_Ready(&PyNone_Type) < 0)
if (PyType_Ready(&_PyNone_Type) < 0)
Py_FatalError("Can't initialize None type");
if (PyType_Ready(&PyNotImplemented_Type) < 0)
if (PyType_Ready(&_PyNotImplemented_Type) < 0)
Py_FatalError("Can't initialize NotImplemented type");
if (PyType_Ready(&PyTraceBack_Type) < 0)