bpo-32030: Make _PySys_AddXOptionWithError() private (GH-10236)

vstinner · web-flow · commit e1b29950bf75 · 2018-10-30T14:31:42.000+01:00
Make _PySys_AddXOptionWithError() and _PySys_AddWarnOptionWithError()
functions private again. They are no longer needed to initialize Python:
_PySys_EndInit() is now responsible to add these options instead.

Moreover, PySys_AddWarnOptionUnicode() now clears the exception on
failure if possible.
diff --git a/Include/sysmodule.h b/Include/sysmodule.h
@@ -37,11 +37,6 @@ PyAPI_FUNC(PyObject *) PySys_GetXOptions(void);
 PyAPI_FUNC(size_t) _PySys_GetSizeOf(PyObject *);
 #endif
 
-#ifdef Py_BUILD_CORE
-PyAPI_FUNC(int) _PySys_AddXOptionWithError(const wchar_t *s);
-PyAPI_FUNC(int) _PySys_AddWarnOptionWithError(PyObject *option);
-#endif
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
@@ -1807,7 +1807,7 @@ PySys_ResetWarnOptions(void)
     PyList_SetSlice(warnoptions, 0, PyList_GET_SIZE(warnoptions), NULL);
 }
 
-int
+static int
 _PySys_AddWarnOptionWithError(PyObject *option)
 {
     PyObject *warnoptions = get_warnoptions();
@@ -1823,7 +1823,12 @@ _PySys_AddWarnOptionWithError(PyObject *option)
 void
 PySys_AddWarnOptionUnicode(PyObject *option)
 {
-    (void)_PySys_AddWarnOptionWithError(option);
+    if (_PySys_AddWarnOptionWithError(option) < 0) {
+        /* No return value, therefore clear error state if possible */
+        if (_PyThreadState_UncheckedGet()) {
+            PyErr_Clear();
+        }
+    }
 }
 
 void
@@ -1877,7 +1882,7 @@ get_xoptions(void)
     return xoptions;
 }
 
-int
+static int
 _PySys_AddXOptionWithError(const wchar_t *s)
 {
     PyObject *name = NULL, *value = NULL;

Original file line number	Diff line number	Diff line change
`@@ -1807,7 +1807,7 @@ PySys_ResetWarnOptions(void)`
`1807`	`1807`	`PyList_SetSlice(warnoptions, 0, PyList_GET_SIZE(warnoptions), NULL);`
`1808`	`1808`	`}`
`1809`	`1809`
`1810`		`-int`
	`1810`	`+static int`
`1811`	`1811`	`_PySys_AddWarnOptionWithError(PyObject *option)`
`1812`	`1812`	`{`
`1813`	`1813`	`PyObject *warnoptions = get_warnoptions();`
`@@ -1823,7 +1823,12 @@ _PySys_AddWarnOptionWithError(PyObject *option)`
`1823`	`1823`	`void`
`1824`	`1824`	`PySys_AddWarnOptionUnicode(PyObject *option)`
`1825`	`1825`	`{`
`1826`		`- (void)_PySys_AddWarnOptionWithError(option);`
	`1826`	`+ if (_PySys_AddWarnOptionWithError(option) < 0) {`
	`1827`	`+ /* No return value, therefore clear error state if possible */`
	`1828`	`+ if (_PyThreadState_UncheckedGet()) {`
	`1829`	`+ PyErr_Clear();`
	`1830`	`+ }`
	`1831`	`+ }`
`1827`	`1832`	`}`
`1828`	`1833`
`1829`	`1834`	`void`
`@@ -1877,7 +1882,7 @@ get_xoptions(void)`
`1877`	`1882`	`return xoptions;`
`1878`	`1883`	`}`
`1879`	`1884`
`1880`		`-int`
	`1885`	`+static int`
`1881`	`1886`	`_PySys_AddXOptionWithError(const wchar_t *s)`
`1882`	`1887`	`{`
`1883`	`1888`	`PyObject name = NULL, value = NULL;`