Skip to content
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

bpo-1635741: port _ctypes extension module to multiphase initialization #30525

Closed
wants to merge 2 commits into from
Closed

bpo-1635741: port _ctypes extension module to multiphase initialization #30525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d72ecb5
port _ctypes
kumaraditya303 Jan 11, 2022
3aaf3ec
📜🤖 Added by blurb_it.
blurb-it[bot] Jan 11, 2022
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/Core and Builtins/2022-01-11-03-56-42.bpo-1635741.Vrjfuk.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Port _ctypes extension module to multiphase initialization.
32 changes: 15 additions & 17 deletions Modules/_ctypes/_ctypes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5668,13 +5668,6 @@ wstring_at(const wchar_t *ptr, int size)
}


static struct PyModuleDef _ctypesmodule = {
PyModuleDef_HEAD_INIT,
.m_name = "_ctypes",
.m_doc = module_docs,
.m_size = -1,
.m_methods = _ctypes_module_methods,
};


static int
Expand Down Expand Up @@ -5847,20 +5840,25 @@ _ctypes_mod_exec(PyObject *mod)
return 0;
}

static struct PyModuleDef_Slot _ctypes_slots[] = {
{Py_mod_exec, _ctypes_mod_exec},
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am just curious about those codes in _ctypes_mod_exec, do we need judge the attr manually?

_unpickle = PyObject_GetAttrString(mod, "_unpickle");
    if (_unpickle == NULL) {
        return -1;
    }

{0, NULL}
};

static struct PyModuleDef _ctypesmodule = {
PyModuleDef_HEAD_INIT,
.m_name = "_ctypes",
.m_doc = module_docs,
.m_size = 0,
.m_methods = _ctypes_module_methods,
.m_slots = _ctypes_slots,
};


PyMODINIT_FUNC
PyInit__ctypes(void)
{
PyObject *mod = PyModule_Create(&_ctypesmodule);
if (!mod) {
return NULL;
}

if (_ctypes_mod_exec(mod) < 0) {
Py_DECREF(mod);
return NULL;
}
return mod;
return PyModuleDef_Init(&_ctypesmodule);
}

/*
Expand Down