diff options
| author | Alexandre Vassalotti <alexandre@peadrop.com> | 2013-12-01 01:55:48 (GMT) |
|---|---|---|
| committer | Alexandre Vassalotti <alexandre@peadrop.com> | 2013-12-01 01:55:48 (GMT) |
| commit | 65846c6c5190a92446176f318fd837c6005cfa29 (patch) | |
| tree | a1b01b9f99a3705ae3d949fb683c234c62f317cc | |
| parent | 19b6fa6ebb887e498437b4ae87d6e70b92b4742b (diff) | |
| download | cpython-65846c6c5190a92446176f318fd837c6005cfa29.zip cpython-65846c6c5190a92446176f318fd837c6005cfa29.tar.gz cpython-65846c6c5190a92446176f318fd837c6005cfa29.tar.bz2 | |
Issue #6477: Keep PyNotImplemented_Type and PyNone_Type private.
| -rw-r--r-- | Include/object.h | 4 | ||||
| -rw-r--r-- | Modules/_pickle.c | 4 | ||||
| -rw-r--r-- | Objects/object.c | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/Include/object.h b/Include/object.h index 5c89ca3..cdeb06c 100644 --- a/Include/object.h +++ b/Include/object.h @@ -831,8 +831,8 @@ they can have object code that is not dependent on Python compilation flags. PyAPI_FUNC(void) Py_IncRef(PyObject *); PyAPI_FUNC(void) Py_DecRef(PyObject *); -PyAPI_DATA(PyTypeObject) PyNone_Type; -PyAPI_DATA(PyTypeObject) PyNotImplemented_Type; +PyAPI_DATA(PyTypeObject) _PyNone_Type; +PyAPI_DATA(PyTypeObject) _PyNotImplemented_Type; /* _Py_NoneStruct is an object of undefined type which can be used in contexts diff --git a/Modules/_pickle.c b/Modules/_pickle.c index ba192fb..ae801f7 100644 --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -2853,13 +2853,13 @@ save_singleton_type(PicklerObject *self, PyObject *obj, PyObject *singleton) static int save_type(PicklerObject *self, PyObject *obj) { - if (obj == (PyObject *)&PyNone_Type) { + if (obj == (PyObject *)&_PyNone_Type) { return save_singleton_type(self, obj, Py_None); } else if (obj == (PyObject *)&PyEllipsis_Type) { return save_singleton_type(self, obj, Py_Ellipsis); } - else if (obj == (PyObject *)&PyNotImplemented_Type) { + else if (obj == (PyObject *)&_PyNotImplemented_Type) { return save_singleton_type(self, obj, Py_NotImplemented); } return save_global(self, obj, NULL); diff --git a/Objects/object.c b/Objects/object.c index 83da6a4..e079d51 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -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) |