Skip to content

gh-72249: Include the module name in the repr of partial object #101910

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
serhiy-storchaka merged 18 commits into from
Feb 25, 2024
Merged

gh-72249: Include the module name in the repr of partial object #101910

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
ce00bbd
Include the module name in the repr of functool
furkanonder Feb 14, 2023
313f4a2
📜🤖 Added by blurb_it.
blurb-it[bot] Feb 14, 2023
0457cc7
Merge branch 'main' into issue-72249
furkanonder Feb 14, 2023
a224851
Mention the authors
furkanonder Mar 31, 2023
6c98069
Merge branch 'main' into issue-72249
furkanonder Feb 18, 2024
dbd79c9
Merge branch 'main' into issue-72249
furkanonder Feb 18, 2024
4551a42
update the news entry
furkanonder Feb 19, 2024
aacf90d
remove _partial_types check in testcases
furkanonder Feb 19, 2024
902e690
use PyType_GetQualName and _PyType_GetModuleName functions to match t…
furkanonder Feb 19, 2024
930928e
Merge branch 'main' into issue-72249
furkanonder Feb 19, 2024
810b5ca
Check return value of _PyType_GetModuleName
furkanonder Feb 24, 2024
f79ce5e
Merge branch 'main' into issue-72249
furkanonder Feb 24, 2024
3777e81
reduce the type(self) usage in __repr__
furkanonder Feb 25, 2024
5369fad
Don't handle the partial's repr without __module__
furkanonder Feb 25, 2024
ef9ea5c
Merge branch 'issue-72249' of github.com:furkanonder/cpython into iss…
furkanonder Feb 25, 2024
52390d3
call Py_ReprLeave
furkanonder Feb 25, 2024
e2174aa
Remove else clause
furkanonder Feb 25, 2024
4542342
Use %S as conversion specifier for module
furkanonder Feb 25, 2024
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
Check return value of _PyType_GetModuleName
  • Loading branch information
@furkanonder
furkanonder committed Feb 24, 2024
commit 810b5ca9228a7cde82571a32a20503949ab9fbd5
22 changes: 16 additions & 6 deletions Modules/_functoolsmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,7 @@ partial_repr(partialobject *pto)
PyObject *result = NULL;
PyObject *arglist;
PyObject *mod;
PyObject *name;
Py_ssize_t i, n;
PyObject *key, *value;
int status;
Expand Down Expand Up @@ -402,17 +403,26 @@ partial_repr(partialobject *pto)
}

mod = _PyType_GetModuleName(Py_TYPE(pto));

if (mod == NULL) {
result = PyUnicode_FromFormat("%S(%R%U)",
PyType_GetQualName(Py_TYPE(pto)),
pto->fn, arglist);
name = PyType_GetQualName(Py_TYPE(pto));
if (name == NULL) {
return NULL;
}
result = PyUnicode_FromFormat("%S(%R%U)", name, pto->fn, arglist);
}
else {
result = PyUnicode_FromFormat("%U.%S(%R%U)",
mod, PyType_GetQualName(Py_TYPE(pto)),
pto->fn, arglist);
name = PyType_GetQualName(Py_TYPE(pto));
if (name == NULL) {
Py_DECREF(mod);
return NULL;
}
result = PyUnicode_FromFormat("%U.%S(%R%U)", mod, name, pto->fn,
arglist);
Py_DECREF(mod);
}

Py_DECREF(name);
Py_DECREF(arglist);

done:
Expand Down