bpo-35452: Make PySys_HasWarnOptions() never raising an exception. (pythonGH-11075)

serhiy-storchaka · web-flow · commit dffccc6b5949 · 2018-12-10T13:50:22.000+02:00
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
@@ -1845,7 +1845,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 *

Original file line number	Diff line number	Diff line change
`@@ -1845,7 +1845,8 @@ int`
`1845`	`1845`	`PySys_HasWarnOptions(void)`
`1846`	`1846`	`{`
`1847`	`1847`	`PyObject *warnoptions = _PySys_GetObjectId(&PyId_warnoptions);`
`1848`		`- return (warnoptions != NULL && (PyList_Size(warnoptions) > 0)) ? 1 : 0;`
	`1848`	`+ return (warnoptions != NULL && PyList_Check(warnoptions)`
	`1849`	`+ && PyList_GET_SIZE(warnoptions) > 0);`
`1849`	`1850`	`}`
`1850`	`1851`
`1851`	`1852`	`static PyObject *`