Unverified Kaydet (Commit) 2094c2be authored tarafından Victor Stinner's avatar Victor Stinner Kaydeden (comit) GitHub

bpo-34567: pythoninfo gets coreconfig (GH-9043)

* Add _testcapi.get_coreconfig() to get the _PyCoreConfig of the
  interpreter
* test.pythoninfo now gets the core configuration using
  _testcapi.get_coreconfig()
üst 8ea09110
...@@ -366,6 +366,10 @@ PyAPI_FUNC(int) _Py_SetFileSystemEncoding( ...@@ -366,6 +366,10 @@ PyAPI_FUNC(int) _Py_SetFileSystemEncoding(
PyAPI_FUNC(void) _Py_ClearFileSystemEncoding(void); PyAPI_FUNC(void) _Py_ClearFileSystemEncoding(void);
#endif #endif
#ifndef Py_LIMITED_API
PyAPI_FUNC(PyObject*) _Py_wstrlist_as_pylist(int len, wchar_t **list);
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
......
...@@ -534,6 +534,17 @@ def collect_gdbm(info_add): ...@@ -534,6 +534,17 @@ def collect_gdbm(info_add):
info_add('gdbm.GDBM_VERSION', '.'.join(map(str, _GDBM_VERSION))) info_add('gdbm.GDBM_VERSION', '.'.join(map(str, _GDBM_VERSION)))
def collect_get_coreconfig(info_add):
try:
from _testcapi import get_coreconfig
except ImportError:
return
config = get_coreconfig()
for key in sorted(config):
info_add('coreconfig[%s]' % key, repr(config[key]))
def collect_info(info): def collect_info(info):
error = False error = False
info_add = info.add info_add = info.add
...@@ -562,6 +573,7 @@ def collect_info(info): ...@@ -562,6 +573,7 @@ def collect_info(info):
collect_resource, collect_resource,
collect_cc, collect_cc,
collect_gdbm, collect_gdbm,
collect_get_coreconfig,
# Collecting from tests should be last as they have side effects. # Collecting from tests should be last as they have side effects.
collect_test_socket, collect_test_socket,
......
...@@ -4642,6 +4642,160 @@ decode_locale_ex(PyObject *self, PyObject *args) ...@@ -4642,6 +4642,160 @@ decode_locale_ex(PyObject *self, PyObject *args)
} }
static PyObject *
get_coreconfig(PyObject *self, PyObject *Py_UNUSED(args))
{
PyInterpreterState *interp = _PyInterpreterState_Get();
const _PyCoreConfig *config = &interp->core_config;
PyObject *dict, *obj;
dict = PyDict_New();
if (dict == NULL) {
return NULL;
}
#define FROM_STRING(STR) \
((STR != NULL) ? \
PyUnicode_FromString(STR) \
: (Py_INCREF(Py_None), Py_None))
#define FROM_WSTRING(STR) \
((STR != NULL) ? \
PyUnicode_FromWideChar(STR, -1) \
: (Py_INCREF(Py_None), Py_None))
#define SET_ITEM(KEY, EXPR) \
do { \
obj = (EXPR); \
if (obj == NULL) { \
return NULL; \
} \
int res = PyDict_SetItemString(dict, (KEY), obj); \
Py_DECREF(obj); \
if (res < 0) { \
goto fail; \
} \
} while (0)
SET_ITEM("install_signal_handlers",
PyLong_FromLong(config->install_signal_handlers));
SET_ITEM("use_environment",
PyLong_FromLong(config->use_environment));
SET_ITEM("use_hash_seed",
PyLong_FromLong(config->use_hash_seed));
SET_ITEM("hash_seed",
PyLong_FromUnsignedLong(config->hash_seed));
SET_ITEM("allocator",
FROM_STRING(config->allocator));
SET_ITEM("dev_mode",
PyLong_FromLong(config->dev_mode));
SET_ITEM("faulthandler",
PyLong_FromLong(config->faulthandler));
SET_ITEM("tracemalloc",
PyLong_FromLong(config->tracemalloc));
SET_ITEM("import_time",
PyLong_FromLong(config->import_time));
SET_ITEM("show_ref_count",
PyLong_FromLong(config->show_ref_count));
SET_ITEM("show_alloc_count",
PyLong_FromLong(config->show_alloc_count));
SET_ITEM("dump_refs",
PyLong_FromLong(config->dump_refs));
SET_ITEM("malloc_stats",
PyLong_FromLong(config->malloc_stats));
SET_ITEM("coerce_c_locale",
PyLong_FromLong(config->coerce_c_locale));
SET_ITEM("coerce_c_locale_warn",
PyLong_FromLong(config->coerce_c_locale_warn));
SET_ITEM("filesystem_encoding",
FROM_STRING(config->filesystem_encoding));
SET_ITEM("filesystem_errors",
FROM_STRING(config->filesystem_errors));
SET_ITEM("stdio_encoding",
FROM_STRING(config->stdio_encoding));
SET_ITEM("utf8_mode",
PyLong_FromLong(config->utf8_mode));
SET_ITEM("pycache_prefix",
FROM_WSTRING(config->pycache_prefix));
SET_ITEM("program_name",
FROM_WSTRING(config->program_name));
SET_ITEM("argv",
_Py_wstrlist_as_pylist(config->argc, config->argv));
SET_ITEM("program",
FROM_WSTRING(config->program));
SET_ITEM("warnoptions",
_Py_wstrlist_as_pylist(config->nwarnoption, config->warnoptions));
SET_ITEM("module_search_path_env",
FROM_WSTRING(config->module_search_path_env));
SET_ITEM("home",
FROM_WSTRING(config->home));
SET_ITEM("module_search_paths",
_Py_wstrlist_as_pylist(config->nmodule_search_path, config->module_search_paths));
SET_ITEM("executable",
FROM_WSTRING(config->executable));
SET_ITEM("prefix",
FROM_WSTRING(config->prefix));
SET_ITEM("base_prefix",
FROM_WSTRING(config->base_prefix));
SET_ITEM("exec_prefix",
FROM_WSTRING(config->exec_prefix));
SET_ITEM("base_exec_prefix",
FROM_WSTRING(config->base_exec_prefix));
#ifdef MS_WINDOWS
SET_ITEM("dll_path",
FROM_WSTRING(config->dll_path));
#endif
SET_ITEM("isolated",
PyLong_FromLong(config->isolated));
SET_ITEM("site_import",
PyLong_FromLong(config->site_import));
SET_ITEM("bytes_warning",
PyLong_FromLong(config->bytes_warning));
SET_ITEM("inspect",
PyLong_FromLong(config->inspect));
SET_ITEM("interactive",
PyLong_FromLong(config->interactive));
SET_ITEM("optimization_level",
PyLong_FromLong(config->optimization_level));
SET_ITEM("parser_debug",
PyLong_FromLong(config->parser_debug));
SET_ITEM("write_bytecode",
PyLong_FromLong(config->write_bytecode));
SET_ITEM("verbose",
PyLong_FromLong(config->verbose));
SET_ITEM("quiet",
PyLong_FromLong(config->quiet));
SET_ITEM("user_site_directory",
PyLong_FromLong(config->user_site_directory));
SET_ITEM("buffered_stdio",
PyLong_FromLong(config->buffered_stdio));
SET_ITEM("stdio_encoding",
FROM_STRING(config->stdio_encoding));
SET_ITEM("stdio_errors",
FROM_STRING(config->stdio_errors));
#ifdef MS_WINDOWS
SET_ITEM("legacy_windows_fs_encoding",
PyLong_FromLong(config->legacy_windows_fs_encoding));
SET_ITEM("legacy_windows_stdio",
PyLong_FromLong(config->legacy_windows_stdio));
#endif
SET_ITEM("_install_importlib",
PyLong_FromLong(config->_install_importlib));
SET_ITEM("_check_hash_pycs_mode",
FROM_STRING(config->_check_hash_pycs_mode));
SET_ITEM("_frozen",
PyLong_FromLong(config->_frozen));
return dict;
fail:
Py_DECREF(dict);
return NULL;
#undef FROM_STRING
#undef FROM_WSTRING
#undef SET_ITEM
}
static PyMethodDef TestMethods[] = { static PyMethodDef TestMethods[] = {
{"raise_exception", raise_exception, METH_VARARGS}, {"raise_exception", raise_exception, METH_VARARGS},
{"raise_memoryerror", raise_memoryerror, METH_NOARGS}, {"raise_memoryerror", raise_memoryerror, METH_NOARGS},
...@@ -4865,6 +5019,7 @@ static PyMethodDef TestMethods[] = { ...@@ -4865,6 +5019,7 @@ static PyMethodDef TestMethods[] = {
{"hamt", new_hamt, METH_NOARGS}, {"hamt", new_hamt, METH_NOARGS},
{"EncodeLocaleEx", encode_locale_ex, METH_VARARGS}, {"EncodeLocaleEx", encode_locale_ex, METH_VARARGS},
{"DecodeLocaleEx", decode_locale_ex, METH_VARARGS}, {"DecodeLocaleEx", decode_locale_ex, METH_VARARGS},
{"get_coreconfig", get_coreconfig, METH_NOARGS},
{NULL, NULL} /* sentinel */ {NULL, NULL} /* sentinel */
}; };
......
...@@ -1018,8 +1018,8 @@ pymain_init_core_argv(_PyMain *pymain, _PyCoreConfig *config, _PyCmdline *cmdlin ...@@ -1018,8 +1018,8 @@ pymain_init_core_argv(_PyMain *pymain, _PyCoreConfig *config, _PyCmdline *cmdlin
} }
static PyObject* PyObject*
wstrlist_as_pylist(int len, wchar_t **list) _Py_wstrlist_as_pylist(int len, wchar_t **list)
{ {
assert(list != NULL || len < 1); assert(list != NULL || len < 1);
...@@ -1502,7 +1502,7 @@ _PyMainInterpreterConfig_Read(_PyMainInterpreterConfig *main_config, ...@@ -1502,7 +1502,7 @@ _PyMainInterpreterConfig_Read(_PyMainInterpreterConfig *main_config,
#define COPY_WSTRLIST(ATTR, LEN, LIST) \ #define COPY_WSTRLIST(ATTR, LEN, LIST) \
do { \ do { \
if (ATTR == NULL) { \ if (ATTR == NULL) { \
ATTR = wstrlist_as_pylist(LEN, LIST); \ ATTR = _Py_wstrlist_as_pylist(LEN, LIST); \
if (ATTR == NULL) { \ if (ATTR == NULL) { \
return _Py_INIT_NO_MEMORY(); \ return _Py_INIT_NO_MEMORY(); \
} \ } \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment