diff options
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/typeobject.c | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 190a8b2..5e0d81f 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -3543,23 +3543,34 @@ excess_args(PyObject *args, PyObject *kwds) static int object_init(PyObject *self, PyObject *args, PyObject *kwds) { - int err = 0; PyTypeObject *type = Py_TYPE(self); - if (excess_args(args, kwds) && - (type->tp_new == object_new || type->tp_init != object_init)) { - PyErr_SetString(PyExc_TypeError, "object.__init__() takes no parameters"); - err = -1; + if (excess_args(args, kwds)) { + if (type->tp_init != object_init) { + PyErr_SetString(PyExc_TypeError, "object() takes no arguments"); + return -1; + } + if (type->tp_new == object_new) { + PyErr_Format(PyExc_TypeError, "%.200s() takes no arguments", + type->tp_name); + return -1; + } } - return err; + return 0; } static PyObject * object_new(PyTypeObject *type, PyObject *args, PyObject *kwds) { - if (excess_args(args, kwds) && - (type->tp_init == object_init || type->tp_new != object_new)) { - PyErr_SetString(PyExc_TypeError, "object() takes no parameters"); - return NULL; + if (excess_args(args, kwds)) { + if (type->tp_new != object_new) { + PyErr_SetString(PyExc_TypeError, "object() takes no arguments"); + return NULL; + } + if (type->tp_init == object_init) { + PyErr_Format(PyExc_TypeError, "%.200s() takes no arguments", + type->tp_name); + return NULL; + } } if (type->tp_flags & Py_TPFLAGS_IS_ABSTRACT) { |