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

dffccc6b · Serhiy Storchaka · GitHub · cf247359 · dffccc6b
Unverified Kaydet (Commit) dffccc6b authored Ara 10, 2018 tarafından Serhiy Storchaka Kaydeden (comit) GitHub Ara 10, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sysmodule.c Python/sysmodule.c +2 -1

No files found.
--- 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 *