Skip to content

gh-127787: refactor helpers for PyUnicodeErrorObject internal interface #127789

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
encukou merged 21 commits into from
Jan 3, 2025
Merged

gh-127787: refactor helpers for PyUnicodeErrorObject internal interface #127789

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
0cc7bc7
Refactor helpers for `PyUnicodeErrorObject`.
picnixz Dec 10, 2024
32a199d
put comment section headers
picnixz Dec 10, 2024
2583095
add comments
picnixz Dec 10, 2024
f0893b7
simpler checks
picnixz Dec 10, 2024
a4b01f0
fix tests
picnixz Dec 10, 2024
01b5f22
unify even more the interface using a generic getter
picnixz Dec 10, 2024
be982a0
remove useless `consistent` parameter
picnixz Dec 10, 2024
d4dc9a6
Simplify call
picnixz Dec 11, 2024
3078f23
Merge branch 'main' into feat/exc/unicode-error-refactor-127787
picnixz Dec 13, 2024
94800fd
remove unused function
picnixz Dec 13, 2024
e5709fa
remove un-necessary macros
picnixz Dec 13, 2024
83eb24d
Update Objects/exceptions.c
picnixz Jan 2, 2025
7c9fd99
style update
picnixz Jan 3, 2025
8219be9
use macro for repeated names to avoid typos
picnixz Jan 3, 2025
4a5e4e3
specialize _PyUnicodeError_GetParams for start and end attributes
picnixz Jan 3, 2025
f7a2efa
update comments
picnixz Jan 3, 2025
17367ff
put 2 blank lines before sections
picnixz Jan 3, 2025
c05f2ad
add NULL assertions to avoid obscure segmentation faults
picnixz Jan 3, 2025
6c07afc
update comments
picnixz Jan 3, 2025
ebf86c7
fixup comment
picnixz Jan 3, 2025
3fb81c2
fixup comment
picnixz Jan 3, 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
Prev Previous commit
Next Next commit
style update
  • Loading branch information
@picnixz
picnixz committed Jan 3, 2025
commit 7c9fd99eff79c74a7f0775c6742d267e0da033b2
9 changes: 5 additions & 4 deletions Objects/exceptions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2676,14 +2676,15 @@ static PyObject *
as_unicode_error_attribute(PyObject *attr, const char *name, int as_bytes)
{
assert(as_bytes == 0 || as_bytes == 1);
if (!attr) {
PyErr_Format(PyExc_TypeError, "%.200s attribute not set", name);
if (attr == NULL) {
PyErr_Format(PyExc_TypeError, "%s attribute not set", name);
return NULL;
}
if (!(as_bytes ? PyBytes_Check(attr) : PyUnicode_Check(attr))) {
PyErr_Format(PyExc_TypeError,
"%s attribute must be %s",
name, as_bytes ? "bytes" : "unicode");
name,
as_bytes ? "bytes" : "unicode");
return NULL;
}
return Py_NewRef(attr);
Expand Down Expand Up @@ -2759,7 +2760,7 @@ static inline int
unicode_error_set_reason_impl(PyObject *self, const char *reason)
{
PyObject *value = PyUnicode_FromString(reason);
if (!value) {
if (value == NULL) {
return -1;
}
PyUnicodeErrorObject *exc = PyUnicodeError_CAST(self);
Expand Down