Thanks to visit codestin.com
Credit goes to github.com

Skip to content

gh-103092: Isolate msvcrt #103248

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

Merged
merged 9 commits into from
Apr 12, 2023
Merged

gh-103092: Isolate msvcrt #103248

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a848eaa
gh-103092: isolate msvcrt
aisk Apr 4, 2023
bc8aa95
Update PC/msvcrtmodule.c
aisk Apr 6, 2023
8dd469f
Update Misc/NEWS.d/next/Library/2023-04-04-21-44-25.gh-issue-103092.D…
aisk Apr 9, 2023
cdc37b7
Update PC/msvcrtmodule.c
aisk Apr 9, 2023
6119c5b
Update PC/msvcrtmodule.c
aisk Apr 9, 2023
b3f5edb
fix error branch in exec_module
aisk Apr 9, 2023
cb96632
Merge branch 'main' into isolate-msvcrt
erlend-aasland Apr 10, 2023
49d91e1
Fix merge
erlend-aasland Apr 10, 2023
8663d62
Merge branch 'main' into isolate-msvcrt
aisk Apr 11, 2023
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
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2023-04-04-21-44-25.gh-issue-103092.Dz0_Xn.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Adapt :mod:`!msvcrt` to :pep:`687`.
43 changes: 23 additions & 20 deletions PC/msvcrtmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,19 +564,6 @@ static struct PyMethodDef msvcrt_functions[] = {
{NULL, NULL}
};


static struct PyModuleDef msvcrtmodule = {
PyModuleDef_HEAD_INIT,
"msvcrt",
NULL,
-1,
msvcrt_functions,
NULL,
NULL,
NULL,
NULL
};

static void
insertint(PyObject *d, char *name, int value)
{
Expand Down Expand Up @@ -605,14 +592,11 @@ insertptr(PyObject *d, char *name, void *value)
}
}

PyMODINIT_FUNC
PyInit_msvcrt(void)
static int
exec_module(PyObject* m)
{
int st;
PyObject *d, *version;
PyObject *m = PyModule_Create(&msvcrtmodule);
if (m == NULL)
return NULL;
d = PyModule_GetDict(m);

/* constants for the locking() function's mode argument */
Expand Down Expand Up @@ -664,10 +648,29 @@ PyInit_msvcrt(void)
_VC_CRT_BUILD_VERSION,
_VC_CRT_RBUILD_VERSION);
st = PyModule_AddObject(m, "CRT_ASSEMBLY_VERSION", version);
if (st < 0) return NULL;
if (st < 0) return -1;
#endif
/* make compiler warning quiet if st is unused */
(void)st;

return m;
return 0;

}

static PyModuleDef_Slot msvcrt_slots[] = {
{Py_mod_exec, exec_module},
{0, NULL}
};

static struct PyModuleDef msvcrtmodule = {
.m_base = PyModuleDef_HEAD_INIT,
.m_name = "msvcrt",
.m_methods = msvcrt_functions,
.m_slots = msvcrt_slots
};

PyMODINIT_FUNC
PyInit_msvcrt(void)
{
return PyModuleDef_Init(&msvcrtmodule);
}