Commit 4c11a926 authored by Martin v. Löwis's avatar Martin v. Löwis

Bug #1653736: Complain about keyword arguments to time.isoformat.

Will backport to 2.5.
parent 495df471
...@@ -1740,6 +1740,11 @@ class TestTime(HarmlessMixedComparison): ...@@ -1740,6 +1740,11 @@ class TestTime(HarmlessMixedComparison):
self.assertEqual(t.isoformat(), "00:00:00.100000") self.assertEqual(t.isoformat(), "00:00:00.100000")
self.assertEqual(t.isoformat(), str(t)) self.assertEqual(t.isoformat(), str(t))
def test_1653736(self):
# verify it doesn't accept extra keyword arguments
t = self.theclass(second=1)
self.assertRaises(TypeError, t.isoformat, foo=3)
def test_strftime(self): def test_strftime(self):
t = self.theclass(1, 2, 3, 4) t = self.theclass(1, 2, 3, 4)
self.assertEqual(t.strftime('%H %M %S'), "01 02 03") self.assertEqual(t.strftime('%H %M %S'), "01 02 03")
......
...@@ -347,6 +347,8 @@ Library ...@@ -347,6 +347,8 @@ Library
Extension Modules Extension Modules
----------------- -----------------
- Bug #1653736: Complain about keyword arguments to time.isoformat.
- Bug #1486663: don't reject keyword arguments for subclasses of builtin - Bug #1486663: don't reject keyword arguments for subclasses of builtin
types. types.
......
...@@ -3167,7 +3167,7 @@ time_str(PyDateTime_Time *self) ...@@ -3167,7 +3167,7 @@ time_str(PyDateTime_Time *self)
} }
static PyObject * static PyObject *
time_isoformat(PyDateTime_Time *self) time_isoformat(PyDateTime_Time *self, PyObject *unused)
{ {
char buf[100]; char buf[100];
PyObject *result; PyObject *result;
...@@ -3411,7 +3411,7 @@ time_reduce(PyDateTime_Time *self, PyObject *arg) ...@@ -3411,7 +3411,7 @@ time_reduce(PyDateTime_Time *self, PyObject *arg)
static PyMethodDef time_methods[] = { static PyMethodDef time_methods[] = {
{"isoformat", (PyCFunction)time_isoformat, METH_KEYWORDS, {"isoformat", (PyCFunction)time_isoformat, METH_NOARGS,
PyDoc_STR("Return string in ISO 8601 format, HH:MM:SS[.mmmmmm]" PyDoc_STR("Return string in ISO 8601 format, HH:MM:SS[.mmmmmm]"
"[+HH:MM].")}, "[+HH:MM].")},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment