Skip to content

gh-156963: Raise TypeError when concatenating complexstr with another type #156964

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

Open
fedonman wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −1
Open

gh-156963: Raise TypeError when concatenating complexstr with another type #156964

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
3 changes: 3 additions & 0 deletions Lib/test/test_curses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,6 +796,9 @@ def test_complexstr(self):
self.assertEqual(str(s[1:]), 'bc')
self.assertEqual(str(s[::-1]), 'cbA')
self.assertEqual(str(s + curses.complexstr(['Z'])), 'AbcZ')
# Concatenating anything else raises instead of returning NotImplemented.
self.assertRaises(TypeError, lambda: s + 'Z')
self.assertRaises(TypeError, lambda: s + cc('Z'))
# The empty complexstr.
self.assertEqual(len(curses.complexstr([])), 0)
self.assertEqual(str(curses.complexstr('')), '')
Expand Down
5 changes: 4 additions & 1 deletion Modules/_cursesmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1590,7 +1590,10 @@ complexstr_concat(PyObject *a, PyObject *b)
{
cursesmodule_state *state = get_cursesmodule_state_by_cls(Py_TYPE(a));
if (!Py_IS_TYPE(b, state->complexstr_type)) {
Py_RETURN_NOTIMPLEMENTED;
PyErr_Format(PyExc_TypeError,
"can only concatenate complexstr to complexstr, not %T",
b);
return NULL;
}
PyCursesComplexStrObject *sa = _PyCursesComplexStrObject_CAST(a);
PyCursesComplexStrObject *sb = _PyCursesComplexStrObject_CAST(b);
Expand Down
Loading