gh-108512: Add and use new replacements for PySys_GetObject() (GH-111035)
Add functions PySys_GetAttr(), PySys_GetAttrString(), PySys_GetOptionalAttr() and PySys_GetOptionalAttrString().
This commit is contained in:
@@ -31,7 +31,6 @@ Copyright (C) 1994 Steen Lumholt.
|
||||
#endif
|
||||
|
||||
#include "pycore_long.h" // _PyLong_IsNegative()
|
||||
#include "pycore_sysmodule.h" // _PySys_GetOptionalAttrString()
|
||||
#include "pycore_unicodeobject.h" // _PyUnicode_AsUTF8String
|
||||
|
||||
#ifdef MS_WINDOWS
|
||||
@@ -146,7 +145,7 @@ _get_tcl_lib_path(void)
|
||||
int stat_return_value;
|
||||
PyObject *prefix;
|
||||
|
||||
(void) _PySys_GetOptionalAttrString("base_prefix", &prefix);
|
||||
(void) PySys_GetOptionalAttrString("base_prefix", &prefix);
|
||||
if (prefix == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
@@ -3547,7 +3546,7 @@ PyInit__tkinter(void)
|
||||
|
||||
/* This helps the dynamic loader; in Unicode aware Tcl versions
|
||||
it also helps Tcl find its encodings. */
|
||||
(void) _PySys_GetOptionalAttrString("executable", &uexe);
|
||||
(void) PySys_GetOptionalAttrString("executable", &uexe);
|
||||
if (uexe && PyUnicode_Check(uexe)) { // sys.executable can be None
|
||||
cexe = PyUnicode_EncodeFSDefault(uexe);
|
||||
Py_DECREF(uexe);
|
||||
|
||||
Reference in New Issue
Block a user