summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 98d4e24..d5ac5f8 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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;
}