Get sys attributes

vstinner · vstinner · commit acdcb6c3daae · 2023-10-16T23:00:59.000+02:00
diff --git a/Python/initconfig.c b/Python/initconfig.c
@@ -1021,6 +1021,46 @@ _PyConfig_Copy(PyConfig *config, const PyConfig *config2)
 }
 
 
+static PyObject*
+_PyConfig_Get(const PyConfig *config, const PyConfigSpec *spec)
+{
+    const char *member = config_spec_get_member(spec, (PyConfig*)config);
+    switch (spec->type) {
+    case PyConfig_MEMBER_INT:
+    case PyConfig_MEMBER_UINT:
+    {
+        int value = *(const int*)member;
+        return PyLong_FromLong(value);
+    }
+    case PyConfig_MEMBER_ULONG:
+    {
+        unsigned long value = *(const unsigned long*)member;
+        return PyLong_FromUnsignedLong(value);
+    }
+    case PyConfig_MEMBER_WSTR:
+    case PyConfig_MEMBER_WSTR_OPT:
+    {
+        PyObject *obj;
+        if (PyConfig_GetStr(spec->name, &obj) < 0) {
+            return NULL;
+        }
+        return obj;
+    }
+    case PyConfig_MEMBER_WSTR_LIST:
+    {
+        PyObject *obj;
+        if (PyConfig_GetStrList(spec->name, &obj) < 0) {
+            return NULL;
+        }
+        return obj;
+    }
+    default:
+        break;
+    }
+    Py_UNREACHABLE();
+}
+
+
 PyObject *
 _PyConfig_AsDict(const PyConfig *config)
 {
@@ -1031,44 +1071,7 @@ _PyConfig_AsDict(const PyConfig *config)
 
     const PyConfigSpec *spec = PYCONFIG_SPEC;
     for (; spec->name != NULL; spec++) {
-        const char *member = config_spec_get_member(spec, (PyConfig*)config);
-        PyObject *obj;
-        switch (spec->type) {
-        case PyConfig_MEMBER_INT:
-        case PyConfig_MEMBER_UINT:
-        {
-            int value = *(const int*)member;
-            obj = PyLong_FromLong(value);
-            break;
-        }
-        case PyConfig_MEMBER_ULONG:
-        {
-            unsigned long value = *(const unsigned long*)member;
-            obj = PyLong_FromUnsignedLong(value);
-            break;
-        }
-        case PyConfig_MEMBER_WSTR:
-        case PyConfig_MEMBER_WSTR_OPT:
-        {
-            const wchar_t *wstr = *(const wchar_t**)member;
-            if (wstr != NULL) {
-                obj = PyUnicode_FromWideChar(wstr, -1);
-            }
-            else {
-                obj = Py_NewRef(Py_None);
-            }
-            break;
-        }
-        case PyConfig_MEMBER_WSTR_LIST:
-        {
-            const PyWideStringList *list = (const PyWideStringList*)member;
-            obj = _PyWideStringList_AsList(list);
-            break;
-        }
-        default:
-            Py_UNREACHABLE();
-        }
-
+        PyObject *obj = _PyConfig_Get(config, spec);
         if (obj == NULL) {
             Py_DECREF(dict);
             return NULL;
@@ -3495,6 +3498,30 @@ PyConfig_GetStr(const char *key, PyObject **value)
         return -1;
     }
 
+    if (_PyRuntime.initialized) {
+        const char* sys_attrs[] = {
+            "executable",
+            "_base_executable",
+            "prefix",
+            "base_prefix",
+            "exec_prefix",
+            "base_exec_prefix",
+            "platlibdir",
+            "pycache_prefix",
+            "_stdlib_dir",
+            NULL,
+        };
+        for (const char **attr = sys_attrs; *attr != NULL; attr++) {
+            if (strcmp(key, *attr) == 0) {
+                *value = Py_XNewRef(PySys_GetObject(key));
+                if (*value == NULL) {
+                    return -1;
+                }
+                return 0;
+            }
+        }
+    }
+
     if (spec->type == PyConfig_MEMBER_WSTR
             || spec->type == PyConfig_MEMBER_WSTR_OPT) {
         if (*member != NULL) {
@@ -3524,6 +3551,33 @@ PyConfig_GetStrList(const char *key, PyObject **value)
         return -1;
     }
 
+    if (_PyRuntime.initialized) {
+        const char* sys_attrs[] = {
+            "module_search_paths",
+            "argv",
+            "orig_argv",
+            "xoptions",
+            NULL,
+        };
+        for (const char **attr = sys_attrs; *attr != NULL; attr++) {
+            if (strcmp(key, *attr) == 0) {
+                if (strcmp(key, "module_search_paths") == 0) {
+                    *value = Py_XNewRef(PySys_GetObject("path"));
+                }
+                else if (strcmp(key, "xoptions") == 0) {
+                    *value = Py_XNewRef(PySys_GetObject("_xoptions"));
+                }
+                else {
+                    *value = Py_XNewRef(PySys_GetObject(key));
+                }
+                if (*value == NULL) {
+                    return -1;
+                }
+                return 0;
+            }
+        }
+    }
+
     if (spec->type == PyConfig_MEMBER_WSTR_LIST) {
         *value = _PyWideStringList_AsList(list);
         if (*value == NULL) {
