summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2013-02-19 02:39:18 (GMT)
committerR David Murray <rdmurray@bitdance.com>2013-02-19 02:39:18 (GMT)
commit702a5dc1ed7907c4017106388329db73c038345c (patch)
treeaa552d8155b0598347dbf506b1225b14217d51ce
parent41d4ebbf43f78d390d33420bbbbfd0cb78be4e76 (diff)
parent6b30759022d836099a0844983816edaa5e64f52f (diff)
downloadcpython-702a5dc1ed7907c4017106388329db73c038345c.zip
cpython-702a5dc1ed7907c4017106388329db73c038345c.tar.gz
cpython-702a5dc1ed7907c4017106388329db73c038345c.tar.bz2
#7963: fix error message when 'object' called with arguments.
-rw-r--r--Misc/NEWS3
-rw-r--r--Objects/typeobject.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 5013392..6604566 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 3.3.1?
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
with size >= 2**31), instead of producing illegal marshal data.
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 413c7da..aab83e1 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;
}