Commit 5aff27ae authored by R David Murray's avatar R David Murray

#7963: fix error message when 'object' called with arguments.

Patch by Alexander Belopolsky.
parent c8e75ba2
...@@ -9,6 +9,9 @@ What's New in Python 2.7.4 ...@@ -9,6 +9,9 @@ What's New in Python 2.7.4
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #7963: Fixed misleading error message that issued when object is
called without arguments.
- Issue #5308: Raise ValueError when marshalling too large object (a sequence - Issue #5308: Raise ValueError when marshalling too large object (a sequence
with size >= 2**31), instead of producing illegal marshal data. with size >= 2**31), instead of producing illegal marshal data.
......
...@@ -2897,14 +2897,14 @@ object_new(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -2897,14 +2897,14 @@ object_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
type->tp_init != object_init) type->tp_init != object_init)
{ {
err = PyErr_WarnEx(PyExc_DeprecationWarning, err = PyErr_WarnEx(PyExc_DeprecationWarning,
"object.__new__() takes no parameters", "object() takes no parameters",
1); 1);
} }
else if (type->tp_new != object_new || else if (type->tp_new != object_new ||
type->tp_init == object_init) type->tp_init == object_init)
{ {
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
"object.__new__() takes no parameters"); "object() takes no parameters");
err = -1; err = -1;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment