[Python-checkins] bpo-35337: Fix gettmarg(): use PyStructSequence_GET_ITEM() (GH-10765)
Victor Stinner
webhook-mailer at python.org
Wed Nov 28 09:19:58 EST 2018
https://github.com/python/cpython/commit/1cdfcfc9843d35ab2cb87387d3a79b2c8a585a38
commit: 1cdfcfc9843d35ab2cb87387d3a79b2c8a585a38
branch: master
author: Victor Stinner <vstinner at redhat.com>
committer: GitHub <noreply at github.com>
date: 2018-11-28T15:19:51+01:00
summary:
bpo-35337: Fix gettmarg(): use PyStructSequence_GET_ITEM() (GH-10765)
PyStructSequence_GET_ITEM() must be used instead of
PyTuple_GET_ITEM() on a StructTimeType.
files:
M Modules/timemodule.c
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index c3ecd80a6083..55b82d74cb19 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -568,7 +568,7 @@ gettmarg(PyObject *args, struct tm *p, const char *format)
#ifdef HAVE_STRUCT_TM_TM_ZONE
if (Py_TYPE(args) == &StructTimeType) {
PyObject *item;
- item = PyTuple_GET_ITEM(args, 9);
+ item = PyStructSequence_GET_ITEM(args, 9);
if (item != Py_None) {
p->tm_zone = (char *)PyUnicode_AsUTF8(item);
if (p->tm_zone == NULL) {
@@ -589,7 +589,7 @@ gettmarg(PyObject *args, struct tm *p, const char *format)
}
#endif
}
- item = PyTuple_GET_ITEM(args, 10);
+ item = PyStructSequence_GET_ITEM(args, 10);
if (item != Py_None) {
p->tm_gmtoff = PyLong_AsLong(item);
if (PyErr_Occurred())
More information about the Python-checkins
mailing list