diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2007-02-18 08:50:38 +0000 |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2007-02-18 08:50:38 +0000 |
| commit | b8d661bd5e69f6717fe2b636d6963d03aba5189d (patch) | |
| tree | 426915d0f6bb7a1e66053f53eaf10469fe76e82f | |
| parent | 0c2552c0735b53d367a58d93957c440f309190ae (diff) | |
| download | cpython-git-b8d661bd5e69f6717fe2b636d6963d03aba5189d.tar.gz | |
Revert r53672, just fix signature of time_isoformat instead.
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Modules/datetimemodule.c | 7 |
2 files changed, 6 insertions, 3 deletions
@@ -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 cf8a68ba22..9ae77326b6 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].")}, |