Mercurial > cpython-lru_cache-weakref
diff Objects/typeobject.c @ 27866:bbbba0ee61fb legacy-trunk
SF patch #685738 by Michael Stone.
This changes the default __new__ to refuse arguments iff tp_init is the
default __init__ implementation -- thus making it a TypeError when you
try to pass arguments to a constructor if the class doesn't override at
least __init__ or __new__.
| author | Guido van Rossum <guido@python.org> |
|---|---|
| date | Thu, 13 Feb 2003 16:30:16 +0000 |
| parents | 6b5696541ba4 |
| children | 9255fbde43f3 |
line wrap: on
line diff
--- a/Objects/typeobject.c Thu Feb 13 16:12:21 2003 +0000 +++ b/Objects/typeobject.c Thu Feb 13 16:30:16 2003 +0000 @@ -2251,6 +2251,24 @@ return 0; } +/* If we don't have a tp_new for a new-style class, new will use this one. + Therefore this should take no arguments/keywords. However, this new may + also be inherited by objects that define a tp_init but no tp_new. These + objects WILL pass argumets to tp_new, because it gets the same args as + tp_init. So only allow arguments if we aren't using the default init, in + which case we expect init to handle argument parsing. */ +static PyObject * +object_new(PyTypeObject *type, PyObject *args, PyObject *kwds) +{ + if (type->tp_init == object_init && (PyTuple_GET_SIZE(args) || + (kwds && PyDict_Check(kwds) && PyDict_Size(kwds)))) { + PyErr_SetString(PyExc_TypeError, + "default __new__ takes no parameters"); + return NULL; + } + return type->tp_alloc(type, 0); +} + static void object_dealloc(PyObject *self) { @@ -2487,7 +2505,7 @@ 0, /* tp_dictoffset */ object_init, /* tp_init */ PyType_GenericAlloc, /* tp_alloc */ - PyType_GenericNew, /* tp_new */ + object_new, /* tp_new */ PyObject_Del, /* tp_free */ };