Skip to content

Fix FRect contains error message #3536

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

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Fix FRect contains error message #3536

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b0f5b9
Fix FRect contains message
Hato1 Jul 15, 2025
bce83e3
Make FRect contains message DRYer
Hato1 Jul 15, 2025
7de30a3
Apply change according to review feedback
Hato1 Jul 15, 2025
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
11 changes: 8 additions & 3 deletions src_c/rect_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1994,11 +1994,16 @@ RectExport_containsSeq(RectObject *self, PyObject *arg)
return coord == self->r.x || coord == self->r.y ||
coord == self->r.w || coord == self->r.h;
}

int ret = RectExport_contains_internal(self, (PyObject *const *)&arg, 1);
if (ret < 0) {
PyErr_SetString(PyExc_TypeError, "'in <" ObjectName
">' requires rect style object"
" or int as left operand");
const char *operand_type =
pgFRect_Check((PyObject *)self) ? "float" : "int";

PyErr_Format(
PyExc_TypeError,
"'in %s' requires rect style object or %s as left operand",
ObjectName, operand_type);
}
return ret;
}
Expand Down
Loading