diff options
| author | R David Murray <rdmurray@bitdance.com> | 2013-02-19 02:20:08 (GMT) |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2013-02-19 02:20:08 (GMT) |
| commit | 6b30759022d836099a0844983816edaa5e64f52f (patch) | |
| tree | 706212cb8aab347aab51661a87865527ec41161a /Objects | |
| parent | 1548ed6698a09d77418f6e04756ad092ef8cdc4b (diff) | |
| download | cpython-6b30759022d836099a0844983816edaa5e64f52f.zip cpython-6b30759022d836099a0844983816edaa5e64f52f.tar.gz cpython-6b30759022d836099a0844983816edaa5e64f52f.tar.bz2 | |
#7963: fix error message when 'object' called with arguments.
Patch by Alexander Belopolsky.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/typeobject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c index fd2ae67..bbf03a1 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -2842,14 +2842,14 @@ object_new(PyTypeObject *type, PyObject *args, PyObject *kwds) type->tp_init != object_init) { err = PyErr_WarnEx(PyExc_DeprecationWarning, - "object.__new__() takes no parameters", + "object() takes no parameters", 1); } else if (type->tp_new != object_new || type->tp_init == object_init) { PyErr_SetString(PyExc_TypeError, - "object.__new__() takes no parameters"); + "object() takes no parameters"); err = -1; } } |