gh-87904: Report the public module name in curses types and exceptions (GH-152341)

The curses C types and exceptions now set their tp_name to the public
module, so __module__, repr() and help() report curses.window,
curses.complexchar, curses.complexstr, curses.screen, curses.error,
curses.panel.panel and curses.panel.error instead of the underscore
extension modules.

Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Serhiy Storchaka 2026-06-27 10:10:11 +03:00 committed by GitHub
parent 389e00f13f
commit fd63e21c0b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 32 additions and 9 deletions

View file

@ -442,7 +442,8 @@ def test_complexchar(self):
curses.complexchar('A', curses.A_BOLD))
self.assertNotEqual(curses.complexchar('A'), curses.complexchar('B'))
# repr() shows only a non-default attr/pair, and is a constructor call.
ns = {'_curses': sys.modules[type(cc).__module__]}
modname = type(cc).__module__
ns = {modname: sys.modules[modname]}
self.assertNotIn('attr=', repr(curses.complexchar('z')))
self.assertNotIn('pair=', repr(curses.complexchar('z')))
r = repr(curses.complexchar('A', curses.A_BOLD))
@ -2237,6 +2238,24 @@ def test_has_extended_color_support(self):
r = curses.has_extended_color_support()
self.assertIsInstance(r, bool)
def test_type_names(self):
# The curses types report their public module rather than the
# underscore extension that implements them.
for name in 'window', 'complexchar', 'complexstr', 'screen', 'error':
tp = getattr(curses, name)
self.assertEqual(tp.__module__, 'curses')
self.assertEqual(tp.__qualname__, name)
self.assertEqual(tp.__name__, name)
@requires_curses_func('panel')
def test_panel_type_names(self):
import curses.panel
for name in 'panel', 'error':
tp = getattr(curses.panel, name)
self.assertEqual(tp.__module__, 'curses.panel')
self.assertEqual(tp.__qualname__, name)
self.assertEqual(tp.__name__, name)
class TestAscii(unittest.TestCase):

View file

@ -0,0 +1,4 @@
The :mod:`curses` types and exceptions now report their public module in
:attr:`~type.__module__`, :func:`repr` and :func:`help` -- for example
``curses.window`` instead of ``_curses.window`` and ``curses.panel.error``
instead of ``_curses_panel.error``.

View file

@ -687,7 +687,7 @@ static PyType_Slot PyCursesPanel_Type_slots[] = {
};
static PyType_Spec PyCursesPanel_Type_spec = {
.name = "_curses_panel.panel",
.name = "curses.panel.panel",
.basicsize = sizeof(PyCursesPanelObject),
.flags = (
Py_TPFLAGS_DEFAULT
@ -826,9 +826,9 @@ _curses_panel_exec(PyObject *mod)
return -1;
}
/* For exception _curses_panel.error */
/* For exception curses.panel.error */
state->error = PyErr_NewExceptionWithDoc(
"_curses_panel.error",
"curses.panel.error",
"Exception raised when a curses panel library function returns an error.",
NULL, NULL);

View file

@ -4390,7 +4390,7 @@ static PyType_Slot PyCursesComplexChar_Type_slots[] = {
};
static PyType_Spec PyCursesComplexChar_Type_spec = {
.name = "_curses.complexchar",
.name = "curses.complexchar",
.basicsize = sizeof(PyCursesComplexCharObject),
.flags = Py_TPFLAGS_DEFAULT
| Py_TPFLAGS_IMMUTABLETYPE
@ -4415,7 +4415,7 @@ static PyType_Slot PyCursesComplexStr_Type_slots[] = {
};
static PyType_Spec PyCursesComplexStr_Type_spec = {
.name = "_curses.complexstr",
.name = "curses.complexstr",
.basicsize = offsetof(PyCursesComplexStrObject, cells),
.itemsize = sizeof(cchar_t),
.flags = Py_TPFLAGS_DEFAULT
@ -4778,7 +4778,7 @@ static PyType_Slot PyCursesWindow_Type_slots[] = {
};
static PyType_Spec PyCursesWindow_Type_spec = {
.name = "_curses.window",
.name = "curses.window",
.basicsize = sizeof(PyCursesWindowObject),
.flags = Py_TPFLAGS_DEFAULT
| Py_TPFLAGS_DISALLOW_INSTANTIATION
@ -4954,7 +4954,7 @@ static PyType_Slot PyCursesScreen_Type_slots[] = {
};
static PyType_Spec PyCursesScreen_Type_spec = {
.name = "_curses.screen",
.name = "curses.screen",
.basicsize = sizeof(PyCursesScreenObject),
.flags = Py_TPFLAGS_DEFAULT
| Py_TPFLAGS_DISALLOW_INSTANTIATION
@ -8116,7 +8116,7 @@ cursesmodule_exec(PyObject *module)
/* For exception curses.error */
state->error = PyErr_NewExceptionWithDoc(
"_curses.error",
"curses.error",
"Exception raised when a curses library function returns an error.",
NULL, NULL);
if (state->error == NULL) {