From b8d661bd5e69f6717fe2b636d6963d03aba5189d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Sun, 18 Feb 2007 08:50:38 +0000 Subject: [PATCH] Revert r53672, just fix signature of time_isoformat instead. --- Misc/NEWS | 2 +- Modules/datetimemodule.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index cd72a0c9a83..92c7e7c0617 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -111,7 +111,7 @@ Extension Modules - Patch #1657276: Make NETLINK_DNRTMSG conditional. -- Bug #1653736: Complain about keyword arguments to time.isoformat. +- Bug #1653736: Fix signature of time_isoformat. - operator.count() now raises an OverflowError when the count reaches sys.maxint. diff --git a/Modules/datetimemodule.c b/Modules/datetimemodule.c index cf8a68ba226..9ae77326b66 100644 --- a/Modules/datetimemodule.c +++ b/Modules/datetimemodule.c @@ -3166,8 +3166,11 @@ time_str(PyDateTime_Time *self) return PyObject_CallMethod((PyObject *)self, "isoformat", "()"); } +/* Even though this silently ignores all arguments, it cannot + be fixed to reject them in release25-maint */ static PyObject * -time_isoformat(PyDateTime_Time *self, PyObject *unused) +time_isoformat(PyDateTime_Time *self, PyObject *unused_args, + PyObject *unused_keywords) { char buf[100]; PyObject *result; @@ -3411,7 +3414,7 @@ time_reduce(PyDateTime_Time *self, PyObject *arg) static PyMethodDef time_methods[] = { - {"isoformat", (PyCFunction)time_isoformat, METH_NOARGS, + {"isoformat", (PyCFunction)time_isoformat, METH_KEYWORDS, PyDoc_STR("Return string in ISO 8601 format, HH:MM:SS[.mmmmmm]" "[+HH:MM].")},