summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2013-02-19 02:20:08 (GMT)
committerR David Murray <rdmurray@bitdance.com>2013-02-19 02:20:08 (GMT)
commit6b30759022d836099a0844983816edaa5e64f52f (patch)
tree706212cb8aab347aab51661a87865527ec41161a
parent1548ed6698a09d77418f6e04756ad092ef8cdc4b (diff)
downloadcpython-6b30759022d836099a0844983816edaa5e64f52f.zip
cpython-6b30759022d836099a0844983816edaa5e64f52f.tar.gz
cpython-6b30759022d836099a0844983816edaa5e64f52f.tar.bz2
#7963: fix error message when 'object' called with arguments.
Patch by Alexander Belopolsky.
-rw-r--r--Misc/NEWS3
-rw-r--r--Objects/typeobject.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 51f6f1b..6f01693 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.2.4
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 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;
}
}