Sep 26, 2024 · May 21, 2024 · May 21, 2024 · May 21, 2024 · May 21, 2024 · May 21, 2024
diff --git a/Lib/functools.py b/Lib/functools.py
            self.np = self.args.count(Placeholder)
        if np := self.np:
            if len(args) < np:
                raiseValueError("unfilled placeholders in 'partial' call")
                raiseTypeError("unfilled placeholders in 'partial' call")
            f_args = list(self.args)
            j, pos = 0, 0
            while j < np:
diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py
        p2.new_attr = 'spam'
        self.assertEqual(p2.new_attr, 'spam')

    def test_placeholders_trailing_trim(self):
        PH = self.module.Placeholder
        for args in [(PH,), (PH, 0), (0, PH), (0, PH, 1, PH, PH, PH)]:
            expected, n = tuple(args), len(args)
            while n and args[n-1] is PH:
                n -= 1
            expected = expected[:n]
            p = self.partial(capture, *args)
            self.assertTrue(p.args == expected)

    def test_placeholders(self):
        PH = self.module.Placeholder
        # 1 Placeholder
        args = (PH, 0)
        p = self.partial(capture, *args)
        got, empty = p('x')
        self.assertTrue(('x', 0) == got and empty == {})
        # 2 Placeholders
        args = (PH, 0, PH, 1)
        p = self.partial(capture, *args)
        with self.assertRaises(TypeError):
            got, empty = p('x')
        got, empty = p('x', 'y')
        expected = ('x', 0, 'y', 1)
        self.assertTrue(expected == got and empty == {})

    def test_placeholders_optimization(self):
        PH = self.module.Placeholder
        p = self.partial(capture, PH, 0)
        p2 = self.partial(p, PH, 1, 2, 3)
        expected = (PH, 0, 1, 2, 3)
        self.assertTrue(expected == p2.args)
        p3 = self.partial(p2, -1, 4)
        got, empty = p3(5)
        expected = (-1, 0, 1, 2, 3, 4, 5)
        self.assertTrue(expected == got and empty == {})

    def test_repr(self):
        args = (object(), object())
        args_repr = ', '.join(repr(a) for a in args)
diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c
 } placeholderobject;


 PyDoc_STRVAR(placeholder_doc, "placeholder for partialclass");
 PyDoc_STRVAR(placeholder_doc, "placeholder for partialarguments");


 static PyType_Slot placeholder_type_slots[] = {
 };

 static PyType_Spec placeholder_type_spec = {
    .name = "partial2.Placeholder",
    .name = "partial.Placeholder",
    .basicsize = sizeof(placeholderobject),
    .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE |
             Py_TPFLAGS_IMMUTABLETYPE |
    PyObject *kw;
    PyObject *dict;        /* __dict__ */
    PyObject *weakreflist; /* List of weak references */
    PyObject *placeholder;
    PyObject *placeholder; /* Placeholder for positional arguments */
    Py_ssize_t np;         /* Number of placeholders */
    vectorcallfunc vectorcall;
 } partialobject;
    Py_ssize_t nnargs = PyTuple_GET_SIZE(nargs);
    PyObject *item;
    if (nnargs > 0){
        /* Trim placeholders from the end if needed */
        Py_ssize_t i;
        for (i=nnargs; i > 0;) {
            item = PyTuple_GET_ITEM(nargs, i-1);
            if (!Py_Is(item, pto->placeholder))
                break;
            i--;
        }
        if (i != nnargs)
        if (i != nnargs){
            nnargs = i;

            PyObject *tmp = PyTuple_GetSlice(nargs, 0, nnargs);
            Py_DECREF(nargs);
            nargs = tmp;
        }
        /* Count placeholders */
        if (nnargs > 0){
            for (Py_ssize_t i=0; i < nnargs; i++){
                item = PyTuple_GET_ITEM(nargs, i);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -333,7 +333,7 @@ def __call__(self, /, args, *keywords):
		self.np = self.args.count(Placeholder)
		if np := self.np:
		if len(args) < np:
		raiseValueError("unfilled placeholders in 'partial' call")
		raiseTypeError("unfilled placeholders in 'partial' call")
		f_args = list(self.args)
		j, pos = 0, 0
		while j < np:
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -210,6 +210,43 @@ def foo(bar):
		p2.new_attr = 'spam'
		self.assertEqual(p2.new_attr, 'spam')

		def test_placeholders_trailing_trim(self):
dg-pb marked this conversation as resolved. OutdatedShow resolvedHide resolved
		PH = self.module.Placeholder
		for args in [(PH,), (PH, 0), (0, PH), (0, PH, 1, PH, PH, PH)]:
		expected, n = tuple(args), len(args)
		while n and args[n-1] is PH:
		n -= 1
		expected = expected[:n]
		p = self.partial(capture, *args)
		self.assertTrue(p.args == expected)

		def test_placeholders(self):
		PH = self.module.Placeholder
		# 1 Placeholder
		args = (PH, 0)
		p = self.partial(capture, *args)
		got, empty = p('x')
		self.assertTrue(('x', 0) == got and empty == {})
serhiy-storchaka marked this conversation as resolved. OutdatedShow resolvedHide resolved
		# 2 Placeholders
		args = (PH, 0, PH, 1)
		p = self.partial(capture, *args)
		with self.assertRaises(TypeError):
		got, empty = p('x')
dg-pb marked this conversation as resolved. OutdatedShow resolvedHide resolved
		got, empty = p('x', 'y')
		expected = ('x', 0, 'y', 1)
		self.assertTrue(expected == got and empty == {})
Copy link Member picnixzAug 12, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Ditto

		def test_placeholders_optimization(self):
		PH = self.module.Placeholder
		p = self.partial(capture, PH, 0)
		p2 = self.partial(p, PH, 1, 2, 3)
		expected = (PH, 0, 1, 2, 3)
		self.assertTrue(expected == p2.args)
serhiy-storchaka marked this conversation as resolved. OutdatedShow resolvedHide resolved
		p3 = self.partial(p2, -1, 4)
		got, empty = p3(5)
		expected = (-1, 0, 1, 2, 3, 4, 5)
		self.assertTrue(expected == got and empty == {})

		def test_repr(self):
		args = (object(), object())
		args_repr = ', '.join(repr(a) for a in args)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -48,7 +48,7 @@ typedef struct {
		} placeholderobject;


		PyDoc_STRVAR(placeholder_doc, "placeholder for partialclass");
		PyDoc_STRVAR(placeholder_doc, "placeholder for partialarguments");


		static PyType_Slot placeholder_type_slots[] = {
Expand All		@@ -57,7 +57,7 @@ static PyType_Slot placeholder_type_slots[] = {
		};

		static PyType_Spec placeholder_type_spec = {
		.name = "partial2.Placeholder",
		.name = "partial.Placeholder",
dg-pb marked this conversation as resolved. OutdatedShow resolvedHide resolved
		.basicsize = sizeof(placeholderobject),
		.flags = Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE \|
dg-pb marked this conversation as resolved. OutdatedShow resolvedHide resolved
		Py_TPFLAGS_IMMUTABLETYPE \|
Expand All		@@ -73,7 +73,7 @@ typedef struct {
		PyObject *kw;
		PyObject dict; / __dict__ */
		PyObject weakreflist; / List of weak references */
		PyObject *placeholder;
		PyObject placeholder; / Placeholder for positional arguments */
		Py_ssize_t np; /* Number of placeholders */
		vectorcallfunc vectorcall;
		} partialobject;
Expand DownExpand Up		@@ -155,16 +155,21 @@ partial_new(PyTypeObject type, PyObject args, PyObject *kw)
		Py_ssize_t nnargs = PyTuple_GET_SIZE(nargs);
		PyObject *item;
		if (nnargs > 0){
dg-pb marked this conversation as resolved. OutdatedShow resolvedHide resolved
		/* Trim placeholders from the end if needed */
		Py_ssize_t i;
		for (i=nnargs; i > 0;) {
		item = PyTuple_GET_ITEM(nargs, i-1);
		if (!Py_Is(item, pto->placeholder))
		break;
		i--;
		}
		if (i != nnargs)
		if (i != nnargs){
		nnargs = i;

		PyObject *tmp = PyTuple_GetSlice(nargs, 0, nnargs);
		Py_DECREF(nargs);
		nargs = tmp;
		}
		/* Count placeholders */
		if (nnargs > 0){
		for (Py_ssize_t i=0; i < nnargs; i++){
		item = PyTuple_GET_ITEM(nargs, i);
Expand Down