Thanks to visit codestin.com
Credit goes to github.com

Skip to content

GH-100242: bring functools.py partial implementation more in line with C code #100244

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
merged 4 commits into from
Apr 17, 2024
Merged

GH-100242: bring functools.py partial implementation more in line with C code #100244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c14955c
bring functools.py partial implementation more in line with C code
cfbolz Dec 14, 2022
30557a1
blurb
cfbolz Dec 14, 2022
97b9966
use PyObject_TypeCheck in the C implementation of partial.__new__
cfbolz Dec 14, 2022
59d1501
Merge branch 'main' into gh-100242-partial-no-bare-hasattr
cfbolz Apr 17, 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
2 changes: 1 addition & 1 deletion Lib/functools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ def __new__(cls, func, /, *args, **keywords):
if not callable(func):
raise TypeError("the first argument must be callable")

if hasattr(func, "func"):
if isinstance(func, partial):
args = func.args + args
keywords = {**func.keywords, **keywords}
func = func.func
Expand Down
13 changes: 13 additions & 0 deletions Lib/test/test_functools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,19 @@ def test_nested_optimization(self):
flat = partial(signature, 'asdf', bar=True)
self.assertEqual(signature(nested), signature(flat))

def test_nested_optimization_bug(self):
partial = self.partial
class Builder:
def __call__(self, tag, *children, **attrib):
return (tag, children, attrib)

def __getattr__(self, tag):
return partial(self, tag)

B = Builder()
m = B.m
assert m(1, 2, a=2) == ('m', (1, 2), dict(a=2))

def test_nested_partial_with_attribute(self):
# see issue 25137
partial = self.partial
Expand Down
5 changes: 5 additions & 0 deletions Misc/NEWS.d/next/Library/2022-12-14-15-53-38.gh-issue-100242.Ny7VUO.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Bring pure Python implementation ``functools.partial.__new__`` more in line
with the C-implementation by not just always checking for the presence of
the attribute ``'func'`` on the first argument of ``partial``. Instead, both
the Python version and the C version perform an ``isinstance(func, partial)``
check on the first argument of ``partial``.
15 changes: 11 additions & 4 deletions Modules/_functoolsmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,19 @@ partial_new(PyTypeObject *type, PyObject *args, PyObject *kw)
return NULL;
}

_functools_state *state = get_functools_state_by_type(type);
if (state == NULL) {
return NULL;
}

pargs = pkw = NULL;
func = PyTuple_GET_ITEM(args, 0);
if (Py_TYPE(func)->tp_call == (ternaryfunc)partial_call) {
// The type of "func" might not be exactly the same type object
// as "type", but if it is called using partial_call, it must have the
// same memory layout (fn, args and kw members).

int res = PyObject_TypeCheck(func, state->partial_type);
if (res == -1) {
return NULL;
}
if (res == 1) {
// We can use its underlying function directly and merge the arguments.
partialobject *part = (partialobject *)func;
if (part->dict == NULL) {
Expand Down