diff options
| author | R David Murray <rdmurray@bitdance.com> | 2013-02-19 02:44:03 (GMT) |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2013-02-19 02:44:03 (GMT) |
| commit | aaf16b9cfb1da564050a465e7dea194609d39b6a (patch) | |
| tree | 90b2ed18462a697a49486e4ac5412eaf21fc72e9 | |
| parent | 789ee0f31f2f7868d5ce7d2dce470932e37b1683 (diff) | |
| parent | 702a5dc1ed7907c4017106388329db73c038345c (diff) | |
| download | cpython-aaf16b9cfb1da564050a465e7dea194609d39b6a.zip cpython-aaf16b9cfb1da564050a465e7dea194609d39b6a.tar.gz cpython-aaf16b9cfb1da564050a465e7dea194609d39b6a.tar.bz2 | |
Merge: #7963: fix error message when 'object' called with arguments.
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Objects/typeobject.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -10,6 +10,9 @@ What's New in Python 3.4.0 Alpha 1? Core and Builtins ----------------- +- Issue #7963: Fixed misleading error message that issued when object is + called without arguments. + - Issue #8745: Small speed up zipimport on Windows. Patch by Catalin Iacob. - Issue #5308: Raise ValueError when marshalling too large object (a sequence diff --git a/Objects/typeobject.c b/Objects/typeobject.c index f71cad3..01a5999 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -3059,7 +3059,7 @@ 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.__new__() takes no parameters"); + PyErr_SetString(PyExc_TypeError, "object() takes no parameters"); return NULL; } |