mirror of
https://github.com/python/cpython.git
synced 2025-07-07 19:35:27 +00:00
gh-133711: Log Windows OEM code page in test.pythoninfo (#134840)
Add _winapi.GetOEMCP() function.
This commit is contained in:
parent
d83576bf48
commit
d9ec0ee733
3 changed files with 43 additions and 4 deletions
|
@ -920,10 +920,17 @@ def collect_windows(info_add):
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import _winapi
|
import _winapi
|
||||||
dll_path = _winapi.GetModuleFileName(sys.dllhandle)
|
except ImportError:
|
||||||
info_add('windows.dll_path', dll_path)
|
|
||||||
except (ImportError, AttributeError):
|
|
||||||
pass
|
pass
|
||||||
|
else:
|
||||||
|
try:
|
||||||
|
dll_path = _winapi.GetModuleFileName(sys.dllhandle)
|
||||||
|
info_add('windows.dll_path', dll_path)
|
||||||
|
except AttributeError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
call_func(info_add, 'windows.ansi_code_page', _winapi, 'GetACP')
|
||||||
|
call_func(info_add, 'windows.oem_code_page', _winapi, 'GetOEMCP')
|
||||||
|
|
||||||
# windows.version_caption: "wmic os get Caption,Version /value" command
|
# windows.version_caption: "wmic os get Caption,Version /value" command
|
||||||
import subprocess
|
import subprocess
|
||||||
|
|
|
@ -2747,6 +2747,19 @@ _winapi_GetACP_impl(PyObject *module)
|
||||||
return PyLong_FromUnsignedLong(GetACP());
|
return PyLong_FromUnsignedLong(GetACP());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*[clinic input]
|
||||||
|
_winapi.GetOEMCP
|
||||||
|
|
||||||
|
Get the current Windows ANSI code page identifier.
|
||||||
|
[clinic start generated code]*/
|
||||||
|
|
||||||
|
static PyObject *
|
||||||
|
_winapi_GetOEMCP_impl(PyObject *module)
|
||||||
|
/*[clinic end generated code: output=4def5b07a8be1b3b input=e8caf4353a28e28e]*/
|
||||||
|
{
|
||||||
|
return PyLong_FromUnsignedLong(GetOEMCP());
|
||||||
|
}
|
||||||
|
|
||||||
/*[clinic input]
|
/*[clinic input]
|
||||||
_winapi.GetFileType -> DWORD
|
_winapi.GetFileType -> DWORD
|
||||||
|
|
||||||
|
@ -3007,6 +3020,7 @@ static PyMethodDef winapi_functions[] = {
|
||||||
_WINAPI_WAITFORSINGLEOBJECT_METHODDEF
|
_WINAPI_WAITFORSINGLEOBJECT_METHODDEF
|
||||||
_WINAPI_WRITEFILE_METHODDEF
|
_WINAPI_WRITEFILE_METHODDEF
|
||||||
_WINAPI_GETACP_METHODDEF
|
_WINAPI_GETACP_METHODDEF
|
||||||
|
_WINAPI_GETOEMCP_METHODDEF
|
||||||
_WINAPI_GETFILETYPE_METHODDEF
|
_WINAPI_GETFILETYPE_METHODDEF
|
||||||
_WINAPI__MIMETYPES_READ_WINDOWS_REGISTRY_METHODDEF
|
_WINAPI__MIMETYPES_READ_WINDOWS_REGISTRY_METHODDEF
|
||||||
_WINAPI_NEEDCURRENTDIRECTORYFOREXEPATH_METHODDEF
|
_WINAPI_NEEDCURRENTDIRECTORYFOREXEPATH_METHODDEF
|
||||||
|
|
20
Modules/clinic/_winapi.c.h
generated
20
Modules/clinic/_winapi.c.h
generated
|
@ -1933,6 +1933,24 @@ _winapi_GetACP(PyObject *module, PyObject *Py_UNUSED(ignored))
|
||||||
return _winapi_GetACP_impl(module);
|
return _winapi_GetACP_impl(module);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
PyDoc_STRVAR(_winapi_GetOEMCP__doc__,
|
||||||
|
"GetOEMCP($module, /)\n"
|
||||||
|
"--\n"
|
||||||
|
"\n"
|
||||||
|
"Get the current Windows ANSI code page identifier.");
|
||||||
|
|
||||||
|
#define _WINAPI_GETOEMCP_METHODDEF \
|
||||||
|
{"GetOEMCP", (PyCFunction)_winapi_GetOEMCP, METH_NOARGS, _winapi_GetOEMCP__doc__},
|
||||||
|
|
||||||
|
static PyObject *
|
||||||
|
_winapi_GetOEMCP_impl(PyObject *module);
|
||||||
|
|
||||||
|
static PyObject *
|
||||||
|
_winapi_GetOEMCP(PyObject *module, PyObject *Py_UNUSED(ignored))
|
||||||
|
{
|
||||||
|
return _winapi_GetOEMCP_impl(module);
|
||||||
|
}
|
||||||
|
|
||||||
PyDoc_STRVAR(_winapi_GetFileType__doc__,
|
PyDoc_STRVAR(_winapi_GetFileType__doc__,
|
||||||
"GetFileType($module, /, handle)\n"
|
"GetFileType($module, /, handle)\n"
|
||||||
"--\n"
|
"--\n"
|
||||||
|
@ -2169,4 +2187,4 @@ exit:
|
||||||
#ifndef _WINAPI_GETSHORTPATHNAME_METHODDEF
|
#ifndef _WINAPI_GETSHORTPATHNAME_METHODDEF
|
||||||
#define _WINAPI_GETSHORTPATHNAME_METHODDEF
|
#define _WINAPI_GETSHORTPATHNAME_METHODDEF
|
||||||
#endif /* !defined(_WINAPI_GETSHORTPATHNAME_METHODDEF) */
|
#endif /* !defined(_WINAPI_GETSHORTPATHNAME_METHODDEF) */
|
||||||
/*[clinic end generated code: output=ede63eaaf63aa7e6 input=a9049054013a1b77]*/
|
/*[clinic end generated code: output=4581fd481c3c6293 input=a9049054013a1b77]*/
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue