Skip to content

bpo-43916: select.devpoll uses Py_TPFLAGS_DISALLOW_INSTANTIATION #25751

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 1 commit into from
Apr 30, 2021
Merged

bpo-43916: select.devpoll uses Py_TPFLAGS_DISALLOW_INSTANTIATION #25751

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
4 changes: 4 additions & 0 deletions Lib/test/test_select.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ def test_disallow_instantiation(self):
tp = type(select.poll())
self.assertRaises(TypeError, tp)

if hasattr(select, 'devpoll'):
tp = type(select.devpoll())
self.assertRaises(TypeError, tp)

def tearDownModule():
support.reap_children()

Expand Down
10 changes: 1 addition & 9 deletions Modules/selectmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1110,13 +1110,6 @@ newDevPollObject(PyObject *module)
return self;
}

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

static void
devpoll_dealloc(devpollObject *self)
{
Expand All @@ -1131,15 +1124,14 @@ static PyType_Slot devpoll_Type_slots[] = {
{Py_tp_dealloc, devpoll_dealloc},
{Py_tp_getset, devpoll_getsetlist},
{Py_tp_methods, devpoll_methods},
{Py_tp_new, devpoll_new},
{0, 0},
};

static PyType_Spec devpoll_Type_spec = {
"select.devpoll",
sizeof(devpollObject),
0,
Py_TPFLAGS_DEFAULT,
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_DISALLOW_INSTANTIATION,
devpoll_Type_slots
};

Expand Down