bpo-40947: getpath.c uses PyConfig.platlibdir (GH-20807) (GH-20813)
Followup of bpo-40854, there is one remaining usage of PLATLIBDIR
which should be replaced by config->platlibdir.
test_sys checks that sys.platlibdir attribute exists and is a string.
Update Makefile: getpath.c and sysmodule.c no longer need PLATLIBDIR
macro, PyConfig.platlibdir member is used instead.
Co-authored-by: Sandro Mani <manisandro@gmail.com>
(cherry picked from commit d72b9644a3e6eec83be48b1ebc2ec6ca776134d3)
diff --git a/Modules/getpath.c b/Modules/getpath.c
index 2a7971d..a84c858 100644
--- a/Modules/getpath.c
+++ b/Modules/getpath.c
@@ -130,7 +130,7 @@
wchar_t *exec_prefix_macro; /* EXEC_PREFIX macro */
wchar_t *vpath_macro; /* VPATH macro */
- wchar_t *lib_python; /* "lib/pythonX.Y" */
+ wchar_t *lib_python; /* <platlibdir> / "pythonX.Y" */
int prefix_found; /* found platform independent libraries? */
int exec_prefix_found; /* found the platform dependent libraries? */
@@ -810,7 +810,7 @@
"Could not find platform dependent libraries <exec_prefix>\n");
}
- /* <PLATLIBDIR> / "lib-dynload" */
+ /* <platlibdir> / "lib-dynload" */
wchar_t *lib_dynload = joinpath2(calculate->platlibdir,
L"lib-dynload");
if (lib_dynload == NULL) {
@@ -1296,8 +1296,10 @@
{
PyStatus res;
- /* Path: <PLATLIBDIR> / "pythonXY.zip" */
- wchar_t *path = joinpath2(calculate->platlibdir, L"python" Py_STRINGIFY(PY_MAJOR_VERSION) Py_STRINGIFY(PY_MINOR_VERSION) L".zip");
+ /* Path: <platlibdir> / "pythonXY.zip" */
+ wchar_t *path = joinpath2(calculate->platlibdir,
+ L"python" Py_STRINGIFY(PY_MAJOR_VERSION) Py_STRINGIFY(PY_MINOR_VERSION)
+ L".zip");
if (path == NULL) {
return _PyStatus_NO_MEMORY();
}
@@ -1305,7 +1307,7 @@
if (calculate->prefix_found > 0) {
/* Use the reduced prefix returned by Py_GetPrefix()
- Path: <basename(basename(prefix))> / <PLATLIBDIR> / "python00.zip" */
+ Path: <basename(basename(prefix))> / <platlibdir> / "pythonXY.zip" */
wchar_t *parent = _PyMem_RawWcsdup(calculate->prefix);
if (parent == NULL) {
res = _PyStatus_NO_MEMORY();
@@ -1431,6 +1433,11 @@
calculate_init(PyCalculatePath *calculate, const PyConfig *config)
{
size_t len;
+
+ calculate->warnings = config->pathconfig_warnings;
+ calculate->pythonpath_env = config->pythonpath_env;
+ calculate->platlibdir = config->platlibdir;
+
const char *path = getenv("PATH");
if (path) {
calculate->path_env = Py_DecodeLocale(path, &len);
@@ -1457,14 +1464,16 @@
return DECODE_LOCALE_ERR("VPATH macro", len);
}
- calculate->lib_python = Py_DecodeLocale(PLATLIBDIR "/python" VERSION, &len);
- if (!calculate->lib_python) {
+ // <platlibdir> / "pythonX.Y"
+ wchar_t *pyversion = Py_DecodeLocale("python" VERSION, &len);
+ if (!pyversion) {
return DECODE_LOCALE_ERR("VERSION macro", len);
}
-
- calculate->warnings = config->pathconfig_warnings;
- calculate->pythonpath_env = config->pythonpath_env;
- calculate->platlibdir = config->platlibdir;
+ calculate->lib_python = joinpath2(config->platlibdir, pyversion);
+ PyMem_RawFree(pyversion);
+ if (calculate->lib_python == NULL) {
+ return _PyStatus_NO_MEMORY();
+ }
return _PyStatus_OK();
}