bpo-45434: Convert Py_GETENV() macro to a function (GH-28912)

Avoid calling directly getenv() in the header file.

diff --git a/Include/cpython/pydebug.h b/Include/cpython/pydebug.h
index 78bcb118be46598f866aa62c05e66b87ca81a150..cab799f0b38e0c42f2fb2896c02b05d866b2d50a 100644 (file)
--- a/Include/cpython/pydebug.h
+++ b/Include/cpython/pydebug.h
@@ -29,7 +29,7 @@ PyAPI_DATA(int) Py_LegacyWindowsStdioFlag;
 /* this is a wrapper around getenv() that pays attention to
    Py_IgnoreEnvironmentFlag.  It should be used for getting variables like
    PYTHONPATH and PYTHONHOME from the environment */
-#define Py_GETENV(s) (Py_IgnoreEnvironmentFlag ? NULL : getenv(s))
+PyAPI_DATA(char*) Py_GETENV(const char *name);
 
 #ifdef __cplusplus
 }

diff --git a/Python/initconfig.c b/Python/initconfig.c
index 2e3cde83b2534e1413187ee38bf0764ddd7bd9f7..b91d280906cbefaf102dd3a13d82d072de25c7ba 100644 (file)
--- a/Python/initconfig.c
+++ b/Python/initconfig.c
@@ -249,6 +249,14 @@ fail:
 #undef SET_ITEM_STR
 }
 
+char*
+Py_GETENV(const char *name)
+{
+    if (Py_IgnoreEnvironmentFlag) {
+        return NULL;
+    }
+    return getenv(name);
+}
 
 /* --- PyStatus ----------------------------------------------- */