mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-24 18:34:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

also make NotImplementedType callable

Browse Source
This commit is contained in:
Benjamin Peterson 2011-07-29 18:27:44 -05:00
parent d83be998fc
commit 18d7d7a217
3 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/test_builtin.py
View File

@ -1344,7 +1344,7 @@ class BuiltinTest(unittest.TestCase):
self.assertRaises(TypeError, x.translate, b"1"*256, 1)
def test_construct_singletons(self):
for const in None, Ellipsis:
for const in None, Ellipsis, NotImplemented:
tp = type(const)
self.assertIs(tp(), const)
self.assertRaises(TypeError, tp, 1, 2)

4
Misc/NEWS
View File

@ -10,8 +10,8 @@ What's New in Python 3.3 Alpha 1?
Core and Builtins
-----------------
- Make type(None) and type(Ellipsis) callable. They return the respective
singleton instances.
- Make type(None), type(Ellipsis), and type(NotImplemented) callable. They
return the respective singleton instances.
- Forbid summing bytes in sum().

35
Objects/object.c
View File

@ -1385,6 +1385,17 @@ NotImplemented_repr(PyObject *op)
return PyUnicode_FromString("NotImplemented");
}
static PyObject *
notimplemented_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
{
if (PyTuple_GET_SIZE(args) || (kwargs && PyDict_Size(kwargs))) {
PyErr_SetString(PyExc_TypeError, "NotImplementedType takes no arguments");
return NULL;
}
Py_INCREF(Py_NotImplemented);
return Py_NotImplemented;
}
static PyTypeObject PyNotImplemented_Type = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
"NotImplementedType",
@ -1400,6 +1411,30 @@ static PyTypeObject PyNotImplemented_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 */
0, /*tp_methods */
0, /*tp_members */
0, /*tp_getset */
0, /*tp_base */
0, /*tp_dict */
0, /*tp_descr_get */
0, /*tp_descr_set */
0, /*tp_dictoffset */
0, /*tp_init */
0, /*tp_alloc */
notimplemented_new, /*tp_new */
};
PyObject _Py_NotImplementedStruct = {