From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Mon, 10 Dec 2018 12:37:09 +0000 (-0800) Subject: bpo-35452: Make PySys_HasWarnOptions() never raising an exception. (GH-11075) X-Git-Tag: v3.7.2rc1~17 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea773eb1f9e79e9f558ca1fe8909cf6ac1c00371;p=thirdparty%2FPython%2Fcpython.git bpo-35452: Make PySys_HasWarnOptions() never raising an exception. (GH-11075) (cherry picked from commit dffccc6b594951fc798973e521da205785823f0f) Co-authored-by: Serhiy Storchaka --- diff --git a/Python/sysmodule.c b/Python/sysmodule.c index a04850738170..efe5b29ef33c 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -1823,7 +1823,8 @@ int PySys_HasWarnOptions(void) { PyObject *warnoptions = _PySys_GetObjectId(&PyId_warnoptions); - return (warnoptions != NULL && (PyList_Size(warnoptions) > 0)) ? 1 : 0; + return (warnoptions != NULL && PyList_Check(warnoptions) + && PyList_GET_SIZE(warnoptions) > 0); } static PyObject *