Skip to content

bpo-41771: Update how bdist_wininst loads Python so postinstall scripts again work. #22210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mhammond wants to merge 1 commit into from
Closed

bpo-41771: Update how bdist_wininst loads Python so postinstall scripts again work. #22210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified Lib/distutils/command/wininst-14.0-amd64.exe
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion PC/bdist_wininst/bdist_wininst.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir>$(PySourcePath)lib\distutils\command\</OutDir>
<LinkIncremental>false</LinkIncremental>
<TargetName>wininst-$(VisualStudioVersion)</TargetName>
<TargetName>wininst-$(CrtSDKReferenceVersion)</TargetName>
<TargetName Condition="$(PlatformToolset) == 'v140'">wininst-14.0</TargetName>
<TargetName Condition="$(PlatformToolset) == 'v120'">wininst-12.0</TargetName>
<TargetName Condition="$(PlatformToolset) == 'v110'">wininst-11.0</TargetName>
Expand Down
10 changes: 5 additions & 5 deletions PC/bdist_wininst/install.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,13 +683,13 @@ static int prepare_script_environment(HINSTANCE hPython)
DECLPROC(hPython, PyObject *, PyImport_ImportModule, (char *));
DECLPROC(hPython, int, PyObject_SetAttrString, (PyObject *, char *, PyObject *));
DECLPROC(hPython, PyObject *, PyObject_GetAttrString, (PyObject *, char *));
DECLPROC(hPython, PyObject *, PyCFunction_New, (PyMethodDef *, PyObject *));
DECLPROC(hPython, PyObject *, PyCFunction_NewEx, (PyMethodDef *, PyObject *, PyObject *));
DECLPROC(hPython, PyObject *, Py_BuildValue, (char *, ...));
DECLPROC(hPython, int, PyArg_ParseTuple, (PyObject *, char *, ...));
DECLPROC(hPython, PyObject *, PyErr_Format, (PyObject *, char *));
DECLPROC(hPython, PyObject *, PyLong_FromVoidPtr, (void *));
if (!PyImport_ImportModule || !PyObject_GetAttrString ||
!PyObject_SetAttrString || !PyCFunction_New)
!PyObject_SetAttrString || !PyCFunction_NewEx)
return 1;
if (!Py_BuildValue || !PyArg_ParseTuple || !PyErr_Format)
return 1;
Expand All @@ -701,7 +701,7 @@ static int prepare_script_environment(HINSTANCE hPython)
g_PyExc_OSError = PyObject_GetAttrString(mod, "OSError");
for (i = 0; i < DIM(meth); ++i) {
PyObject_SetAttrString(mod, meth[i].ml_name,
PyCFunction_New(&meth[i], NULL));
PyCFunction_NewEx(&meth[i], NULL, NULL));
}
}
g_Py_BuildValue = Py_BuildValue;
Expand Down Expand Up @@ -732,7 +732,7 @@ do_run_installscript(HINSTANCE hPython, char *pathname, int argc, char **argv)
DECLPROC(hPython, int, PyRun_SimpleString, (char *));
DECLPROC(hPython, int, Py_FinalizeEx, (void));
DECLPROC(hPython, PyObject *, Py_BuildValue, (char *, ...));
DECLPROC(hPython, PyObject *, PyCFunction_New,
DECLPROC(hPython, PyObject *, PyCFunction_NewEx,
(PyMethodDef *, PyObject *));
DECLPROC(hPython, int, PyArg_ParseTuple, (PyObject *, char *, ...));
DECLPROC(hPython, PyObject *, PyErr_Format, (PyObject *, char *));
Expand All @@ -744,7 +744,7 @@ do_run_installscript(HINSTANCE hPython, char *pathname, int argc, char **argv)
if (!Py_BuildValue || !PyArg_ParseTuple || !PyErr_Format)
return 1;

if (!PyCFunction_New || !PyArg_ParseTuple || !PyErr_Format)
if (!PyCFunction_NewEx)
return 1;

if (pathname == NULL || pathname[0] == '\0')
Expand Down