diff options
| author | R David Murray <rdmurray@bitdance.com> | 2013-02-19 03:04:59 (GMT) |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2013-02-19 03:04:59 (GMT) |
| commit | 5aff27aec18e08365891c4bc1d81cca87d9d49fd (patch) | |
| tree | 2ab6cc81c52f5cc763501f0bb90e3df1ff587e85 /Objects | |
| parent | c8e75ba2c57cd94559dccb9cdb4a420f0c924c9e (diff) | |
| download | cpython-5aff27aec18e08365891c4bc1d81cca87d9d49fd.zip cpython-5aff27aec18e08365891c4bc1d81cca87d9d49fd.tar.gz cpython-5aff27aec18e08365891c4bc1d81cca87d9d49fd.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 0a79f8b..518d6e8 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -2897,14 +2897,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; } } |