Skip to content

Commit dd29ae2

Browse files
vstinnervstinner
authored
pythongh-105156: Argument Clinic avoids Py_UNICODE type (python#105161)
Argument Clinic now uses "const wchar_t*" type instead of "const Py_UNICODE*" type for the "Py_UNICODE" format.
1 parent c05c31d commit dd29ae2

File tree

9 files changed

+100
-110
lines changed

9 files changed

+100
-110
lines changed

‎Modules/_winapi.c‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,14 +1058,13 @@ process ID, and thread ID.
10581058
[clinic start generated code]*/
10591059

10601060
static PyObject *
1061-
_winapi_CreateProcess_impl(PyObject *module,
1062-
const Py_UNICODE *application_name,
1061+
_winapi_CreateProcess_impl(PyObject *module, const wchar_t *application_name,
10631062
PyObject *command_line, PyObject *proc_attrs,
10641063
PyObject *thread_attrs, BOOL inherit_handles,
10651064
DWORD creation_flags, PyObject *env_mapping,
1066-
const Py_UNICODE *current_directory,
1065+
const wchar_t *current_directory,
10671066
PyObject *startup_info)
1068-
/*[clinic end generated code: output=9b2423a609230132 input=42ac293eaea03fc4]*/
1067+
/*[clinic end generated code: output=a25c8e49ea1d6427 input=42ac293eaea03fc4]*/
10691068
{
10701069
PyObject *ret = NULL;
10711070
BOOL result;

‎Modules/clinic/_winapi.c.h‎

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Modules/clinic/overlapped.c.h‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Modules/clinic/posixmodule.c.h‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Modules/overlapped.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -445,8 +445,8 @@ EventAttributes must be None.
445445
static PyObject *
446446
_overlapped_CreateEvent_impl(PyObject *module, PyObject *EventAttributes,
447447
BOOL ManualReset, BOOL InitialState,
448-
const Py_UNICODE *Name)
449-
/*[clinic end generated code: output=8e04f0916c17b13d input=dbc36ae14375ba24]*/
448+
const wchar_t *Name)
449+
/*[clinic end generated code: output=b17ddc5fd506972d input=dbc36ae14375ba24]*/
450450
{
451451
HANDLE Event;
452452

@@ -1600,8 +1600,8 @@ Connect to the pipe for asynchronous I/O (overlapped).
16001600

16011601
static PyObject *
16021602
_overlapped_Overlapped_ConnectPipe_impl(OverlappedObject *self,
1603-
const Py_UNICODE *Address)
1604-
/*[clinic end generated code: output=3cc9661667d459d4 input=167c06a274efcefc]*/
1603+
const wchar_t *Address)
1604+
/*[clinic end generated code: output=67cbd8e4d3a57855 input=167c06a274efcefc]*/
16051605
{
16061606
HANDLE PipeHandle;
16071607

‎Modules/posixmodule.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5650,8 +5650,8 @@ Execute the command in a subshell.
56505650
[clinic start generated code]*/
56515651

56525652
static long
5653-
os_system_impl(PyObject *module, const Py_UNICODE *command)
5654-
/*[clinic end generated code: output=5b7c3599c068ca42 input=303f5ce97df606b0]*/
5653+
os_system_impl(PyObject *module, const wchar_t *command)
5654+
/*[clinic end generated code: output=dd528cbd5943a679 input=303f5ce97df606b0]*/
56555655
{
56565656
long result;
56575657

@@ -13571,9 +13571,9 @@ the underlying Win32 ShellExecute function doesn't work if it is.
1357113571

1357213572
static PyObject *
1357313573
os_startfile_impl(PyObject *module, path_t *filepath,
13574-
const Py_UNICODE *operation, const Py_UNICODE *arguments,
13574+
const wchar_t *operation, const wchar_t *arguments,
1357513575
path_t *cwd, int show_cmd)
13576-
/*[clinic end generated code: output=3baa4f9795841880 input=8248997b80669622]*/
13576+
/*[clinic end generated code: output=1c6f2f3340e31ffa input=8248997b80669622]*/
1357713577
{
1357813578
HINSTANCE rc;
1357913579

0 commit comments

Comments
 (0)