Sep 26, 2024 · May 21, 2024 · May 21, 2024 · May 21, 2024 · May 21, 2024 · May 21, 2024
diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c
   argument place is empty when using `partial` class
 */

 PyObject*
 Py_GetPlaceholder(void);
 #define PY_CONSTANT_PLACEHOLDER 0

 static PyObject* constants[] = {
    NULL,         // PY_CONSTANT_PLACEHOLDER
 };

 typedef struct {
    PyObject_HEAD
 } placeholderobject;

 PyDoc_STRVAR(placeholder_doc,
 "PlaceholderType()\n"
 "--\n\n"
 "The type of the Placeholder singleton.\n"
 "Used as a placeholder for partial arguments.");

 static PyObject *
 placeholder_repr(PyObject *op)
        PyErr_SetString(PyExc_TypeError, "PlaceholderType takes no arguments");
        return NULL;
    }
    return Py_GetPlaceholder();
    PyObject *singleton = constants[PY_CONSTANT_PLACEHOLDER];
    if (singleton == NULL) {
        singleton = PyType_GenericNew(type, NULL, NULL);
        constants[PY_CONSTANT_PLACEHOLDER] = singleton;
    }
    return singleton;
 }

 static int
    return -1;
 }

 static PyNumberMethods placeholder_as_number = {
    .nb_bool = placeholder_bool,
 };


 PyDoc_STRVAR(placeholder_doc,
 "PlaceholderType()\n"
 "--\n\n"
 "The type of the Placeholder singleton."
 "Used as a placeholder for partial arguments.");

 PyTypeObject _PyPlaceholder_Type = {
    PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "PlaceholderType",
    0,
    0,
    placeholder_dealloc,    /*tp_dealloc*/ /*never called*/
    0,                      /*tp_vectorcall_offset*/
    0,                      /*tp_getattr*/
    0,                      /*tp_setattr*/
    0,                      /*tp_as_async*/
    placeholder_repr,       /*tp_repr*/
    &placeholder_as_number, /*tp_as_number*/
    0,                      /*tp_as_sequence*/
    0,                      /*tp_as_mapping*/
    0,                      /*tp_hash */
    0,                      /*tp_call */
    0,                      /*tp_str */
    0,                      /*tp_getattro */
    0,                      /*tp_setattro */
    0,                      /*tp_as_buffer */
    Py_TPFLAGS_DEFAULT,     /*tp_flags */
    placeholder_doc,        /*tp_doc */
    0,                      /*tp_traverse */
    0,                      /*tp_clear */
    0,                      /*tp_richcompare */
    0,                      /*tp_weaklistoffset */
    0,                      /*tp_iter */
    0,                      /*tp_iternext */
    0,                      /*tp_methods */
    0,                      /*tp_members */
    0,                      /*tp_getset */
    0,                      /*tp_base */
    0,                      /*tp_dict */
    0,                      /*tp_descr_get */
    0,                      /*tp_descr_set */
    0,                      /*tp_dictoffset */
    0,                      /*tp_init */
    0,                      /*tp_alloc */
    placeholder_new,        /*tp_new */
 static PyType_Slot placeholder_type_slots[] = {
    {Py_tp_dealloc, placeholder_dealloc},
    {Py_tp_repr, placeholder_repr},
    {Py_tp_doc, (void *)placeholder_doc},
    {Py_tp_new, placeholder_new},
    // Number protocol
    {Py_nb_bool, placeholder_bool},
    {0, 0}
 };

 PyObject _Py_PlaceholderStruct = _PyObject_HEAD_INIT(&_PyPlaceholder_Type);

 #define PY_CONSTANT_PLACEHOLDER 0

 static PyObject* constants[] = {
    &_Py_PlaceholderStruct,         // PY_CONSTANT_PLACEHOLDER
 static PyType_Spec placeholder_type_spec = {
    .name = "partial.PlaceholderType",
    .basicsize = sizeof(placeholderobject),
    .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_IMMUTABLETYPE,
    .slots = placeholder_type_slots
 };

 PyObject*
 Py_GetPlaceholder(void)
 {
    if (PY_CONSTANT_PLACEHOLDER < Py_ARRAY_LENGTH(constants)) {
        return constants[PY_CONSTANT_PLACEHOLDER];
    }
    else {
        PyErr_BadInternalCall();
        return NULL;
    }
 }


 typedef struct {
    PyObject_HEAD
        return NULL;
    }

    pto->placeholder =Py_GetPlaceholder();
    pto->placeholder =PyObject_CallNoArgs((PyObject *)state->placeholder_type);
    Py_ssize_t nnp = 0;
    Py_ssize_t nnargs = PyTuple_GET_SIZE(nargs);
    PyObject *item;
        return -1;
    }

    if (PyModule_AddObject(module, "Placeholder", Py_GetPlaceholder()) < 0) {
    // if (PyModule_AddObject(module, "Placeholder", Py_GetPlaceholder()) < 0) {
    //     return -1;
    // }
    state->placeholder_type = (PyTypeObject *)PyType_FromModuleAndSpec(module,
        &placeholder_type_spec, NULL);
    if (state->placeholder_type == NULL) {
        return -1;
    }
    if (PyModule_AddType(module, state->placeholder_type) < 0) {
        return -1;
    }
    if (PyModule_AddObject(module, "Placeholder", PyObject_CallNoArgs((PyObject *)state->placeholder_type)) < 0) {
        return -1;
    }
    state->partial_type = (PyTypeObject *)PyType_FromModuleAndSpec(module,
 {
    _functools_state *state = get_functools_state(module);
    Py_VISIT(state->kwd_mark);
    Py_VISIT(state->placeholder_type);
    Py_VISIT(state->partial_type);
    Py_VISIT(state->keyobject_type);
    Py_VISIT(state->lru_list_elem_type);
 {
    _functools_state *state = get_functools_state(module);
    Py_CLEAR(state->kwd_mark);
    Py_CLEAR(state->placeholder_type);
    Py_CLEAR(state->partial_type);
    Py_CLEAR(state->keyobject_type);
    Py_CLEAR(state->lru_list_elem_type);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -48,8 +48,21 @@ Placeholder is an object that can be used to signal that positional
		argument place is empty when using `partial` class
		*/

		PyObject*
		Py_GetPlaceholder(void);
		#define PY_CONSTANT_PLACEHOLDER 0

		static PyObject* constants[] = {
		NULL, // PY_CONSTANT_PLACEHOLDER
		};

		typedef struct {
		PyObject_HEAD
		} placeholderobject;

		PyDoc_STRVAR(placeholder_doc,
		"PlaceholderType()\n"
		"--\n\n"
		"The type of the Placeholder singleton.\n"
		"Used as a placeholder for partial arguments.");

		static PyObject *
		placeholder_repr(PyObject *op)
Expand All		@@ -74,7 +87,12 @@ placeholder_new(PyTypeObject type, PyObject args, PyObject *kwargs)
		PyErr_SetString(PyExc_TypeError, "PlaceholderType takes no arguments");
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. You could use`%T` for the name of the class maybe.
		return NULL;
		}
		return Py_GetPlaceholder();
		PyObject *singleton = constants[PY_CONSTANT_PLACEHOLDER];
		if (singleton == NULL) {
		singleton = PyType_GenericNew(type, NULL, NULL);
		constants[PY_CONSTANT_PLACEHOLDER] = singleton;
		}
		return singleton;
		}

		static int
Expand All		@@ -85,78 +103,23 @@ placeholder_bool(PyObject *v)
		return -1;
		}

		static PyNumberMethods placeholder_as_number = {
		.nb_bool = placeholder_bool,
		};


		PyDoc_STRVAR(placeholder_doc,
		"PlaceholderType()\n"
		"--\n\n"
		"The type of the Placeholder singleton."
		"Used as a placeholder for partial arguments.");

		PyTypeObject _PyPlaceholder_Type = {
		PyVarObject_HEAD_INIT(&PyType_Type, 0)
		"PlaceholderType",
		0,
		0,
		placeholder_dealloc, /tp_dealloc/ /never called/
		0, /tp_vectorcall_offset/
		0, /tp_getattr/
		0, /tp_setattr/
		0, /tp_as_async/
		placeholder_repr, /tp_repr/
		&placeholder_as_number, /tp_as_number/
		0, /tp_as_sequence/
		0, /tp_as_mapping/
		0, /tp_hash /
		0, /tp_call /
		0, /tp_str /
		0, /tp_getattro /
		0, /tp_setattro /
		0, /tp_as_buffer /
		Py_TPFLAGS_DEFAULT, /tp_flags /
		placeholder_doc, /tp_doc /
		0, /tp_traverse /
		0, /tp_clear /
		0, /tp_richcompare /
		0, /tp_weaklistoffset /
		0, /tp_iter /
		0, /tp_iternext /
		0, /tp_methods /
		0, /tp_members /
		0, /tp_getset /
		0, /tp_base /
		0, /tp_dict /
		0, /tp_descr_get /
		0, /tp_descr_set /
		0, /tp_dictoffset /
		0, /tp_init /
		0, /tp_alloc /
		placeholder_new, /tp_new /
		static PyType_Slot placeholder_type_slots[] = {
		{Py_tp_dealloc, placeholder_dealloc},
		{Py_tp_repr, placeholder_repr},
		{Py_tp_doc, (void *)placeholder_doc},
		{Py_tp_new, placeholder_new},
		// Number protocol
		{Py_nb_bool, placeholder_bool},
		{0, 0}
		};

		PyObject _Py_PlaceholderStruct = _PyObject_HEAD_INIT(&_PyPlaceholder_Type);

		#define PY_CONSTANT_PLACEHOLDER 0

		static PyObject* constants[] = {
		&_Py_PlaceholderStruct, // PY_CONSTANT_PLACEHOLDER
		static PyType_Spec placeholder_type_spec = {
		.name = "partial.PlaceholderType",
		.basicsize = sizeof(placeholderobject),
		.flags = Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_IMMUTABLETYPE,
		.slots = placeholder_type_slots
		};

		PyObject*
		Py_GetPlaceholder(void)
		{
		if (PY_CONSTANT_PLACEHOLDER < Py_ARRAY_LENGTH(constants)) {
		return constants[PY_CONSTANT_PLACEHOLDER];
		}
		else {
		PyErr_BadInternalCall();
		return NULL;
		}
		}


		typedef struct {
		PyObject_HEAD
Expand DownExpand Up		@@ -242,7 +205,7 @@ partial_new(PyTypeObject type, PyObject args, PyObject *kw)
		return NULL;
		}

		pto->placeholder =Py_GetPlaceholder();
		pto->placeholder =PyObject_CallNoArgs((PyObject *)state->placeholder_type);
dg-pb marked this conversation as resolved. OutdatedShow resolvedHide resolved
		Py_ssize_t nnp = 0;
		Py_ssize_t nnargs = PyTuple_GET_SIZE(nargs);
		PyObject *item;
Expand DownExpand Up		@@ -1738,7 +1701,18 @@ _functools_exec(PyObject *module)
		return -1;
		}

		if (PyModule_AddObject(module, "Placeholder", Py_GetPlaceholder()) < 0) {
		// if (PyModule_AddObject(module, "Placeholder", Py_GetPlaceholder()) < 0) {
		// return -1;
		// }
		state->placeholder_type = (PyTypeObject *)PyType_FromModuleAndSpec(module,
		&placeholder_type_spec, NULL);
		if (state->placeholder_type == NULL) {
		return -1;
		}
		if (PyModule_AddType(module, state->placeholder_type) < 0) {
		return -1;
		}
		if (PyModule_AddObject(module, "Placeholder", PyObject_CallNoArgs((PyObject *)state->placeholder_type)) < 0) {
		return -1;
		}
		state->partial_type = (PyTypeObject *)PyType_FromModuleAndSpec(module,
Expand DownExpand Up		@@ -1785,6 +1759,7 @@ _functools_traverse(PyObject module, visitproc visit, void arg)
		{
		_functools_state *state = get_functools_state(module);
		Py_VISIT(state->kwd_mark);
		Py_VISIT(state->placeholder_type);
		Py_VISIT(state->partial_type);
		Py_VISIT(state->keyobject_type);
		Py_VISIT(state->lru_list_elem_type);
Expand All		@@ -1796,6 +1771,7 @@ _functools_clear(PyObject *module)
		{
		_functools_state *state = get_functools_state(module);
		Py_CLEAR(state->kwd_mark);
		Py_CLEAR(state->placeholder_type);
		Py_CLEAR(state->partial_type);
		Py_CLEAR(state->keyobject_type);
		Py_CLEAR(state->lru_list_elem_type);
Expand Down