Support tuple and list for the specs

matrixise · matrixise · commit 9ac0af48a1cc · 2019-03-22T18:16:11.000+01:00
diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
@@ -6360,13 +6360,18 @@ _check_invalid_datetime_specs(PyObject *module, PyObject *args)
         return NULL;
     }
 
+    assert(PyTuple_CheckExact(specs) || PyList_CheckExact(specs));
+
     PyObject *found_invalid_specs = PyList_New(0);
     if (found_invalid_specs == NULL) {
         return NULL;
     }
 
-    for (Py_ssize_t pos = 0; pos < PyTuple_GET_SIZE(specs); pos++) {
-        PyObject *spec = PyTuple_GET_ITEM(specs, pos);
+    PyObject *(*GetItem)(PyObject *, Py_ssize_t) = \
+        PyTuple_CheckExact(specs) ? PyTuple_GetItem : PyList_GetItem;
+
+    for (Py_ssize_t pos = 0; pos < PyObject_Size(specs); pos++) {
+        PyObject *spec = GetItem(specs, pos);
         if (PySequence_Contains(format, spec)) {
             PyList_Append(found_invalid_specs, spec);
         }

Original file line number	Diff line number	Diff line change
`@@ -6360,13 +6360,18 @@ _check_invalid_datetime_specs(PyObject module, PyObject args)`
`6360`	`6360`	`return NULL;`
`6361`	`6361`	`}`
`6362`	`6362`
	`6363`	`+ assert(PyTuple_CheckExact(specs) \|\| PyList_CheckExact(specs));`
	`6364`	`+`
`6363`	`6365`	`PyObject *found_invalid_specs = PyList_New(0);`
`6364`	`6366`	`if (found_invalid_specs == NULL) {`
`6365`	`6367`	`return NULL;`
`6366`	`6368`	`}`
`6367`	`6369`
`6368`		`- for (Py_ssize_t pos = 0; pos < PyTuple_GET_SIZE(specs); pos++) {`
`6369`		`- PyObject *spec = PyTuple_GET_ITEM(specs, pos);`
	`6370`	`+ PyObject (GetItem)(PyObject *, Py_ssize_t) = \`
	`6371`	`+ PyTuple_CheckExact(specs) ? PyTuple_GetItem : PyList_GetItem;`
	`6372`	`+`
	`6373`	`+ for (Py_ssize_t pos = 0; pos < PyObject_Size(specs); pos++) {`
	`6374`	`+ PyObject *spec = GetItem(specs, pos);`
`6370`	`6375`	`if (PySequence_Contains(format, spec)) {`
`6371`	`6376`	`PyList_Append(found_invalid_specs, spec);`
`6372`	`6377`	`}`