Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

bpo-43916: Select now uses Py_TPFLAGS_DISALLOW_INSTANTIATION #25750

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
vstinner merged 2 commits into from
Apr 30, 2021
Merged

bpo-43916: Select now uses Py_TPFLAGS_DISALLOW_INSTANTIATION #25750

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
def0955
Select now uses Py_TPFLAGS_DISALLOW_INSTANTIATION
Apr 30, 2021
0ea2f04
Add regression test
Apr 30, 2021
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
4 changes: 4 additions & 0 deletions 4 Lib/test/test_select.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,10 @@ def fileno(self):
a[:] = [F()] * 10
self.assertEqual(select.select([], a, []), ([], a[:5], []))

def test_disallow_instantiation(self):
tp = type(select.poll())
self.assertRaises(TypeError, tp)
Comment thread
erlend-aasland marked this conversation as resolved.

def tearDownModule():
support.reap_children()

Expand Down
17 changes: 4 additions & 13 deletions 17 Modules/selectmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,13 +728,6 @@ newPollObject(PyObject *module)
return self;
}

static PyObject *
poll_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
{
PyErr_Format(PyExc_TypeError, "Cannot create '%.200s' instances", _PyType_Name(type));
return NULL;
}

static void
poll_dealloc(pollObject *self)
{
Expand Down Expand Up @@ -2275,16 +2268,14 @@ static PyMethodDef poll_methods[] = {
static PyType_Slot poll_Type_slots[] = {
{Py_tp_dealloc, poll_dealloc},
{Py_tp_methods, poll_methods},
{Py_tp_new, poll_new},
{0, 0},
};

static PyType_Spec poll_Type_spec = {
"select.poll",
sizeof(pollObject),
0,
Py_TPFLAGS_DEFAULT,
poll_Type_slots
.name = "select.poll",
.basicsize = sizeof(pollObject),
.flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_DISALLOW_INSTANTIATION,
.slots = poll_Type_slots,
};

#ifdef HAVE_SYS_DEVPOLL_H
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.