diff options
| -rw-r--r-- | Modules/clinic/md5module.c.h | 4 | ||||
| -rwxr-xr-x | Tools/clinic/clinic.py | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/Modules/clinic/md5module.c.h b/Modules/clinic/md5module.c.h index 11db795..1d98c57 100644 --- a/Modules/clinic/md5module.c.h +++ b/Modules/clinic/md5module.c.h @@ -9,7 +9,7 @@ PyDoc_STRVAR(MD5Type_copy__doc__, "Return a copy of the hash object."); #define MD5TYPE_COPY_METHODDEF \ - {"copy", _PyCFunction_CAST(MD5Type_copy), METH_METHOD|METH_FASTCALL|METH_KEYWORDS, MD5Type_copy__doc__}, + {"copy", (PyCFunction)(void(*)(void))MD5Type_copy, METH_METHOD|METH_FASTCALL|METH_KEYWORDS, MD5Type_copy__doc__}, static PyObject * MD5Type_copy_impl(MD5object *self, PyTypeObject *cls); @@ -97,4 +97,4 @@ _md5_md5(PyObject *module, PyObject *args, PyObject *kwargs) exit: return return_value; } -/*[clinic end generated code: output=015f7613e3a9bb93 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=81702ec915f36236 input=a9049054013a1b77]*/ diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py index a549865..3112e7c 100755 --- a/Tools/clinic/clinic.py +++ b/Tools/clinic/clinic.py @@ -1199,7 +1199,7 @@ class CLanguage(Language): fastcall = not new_or_init limited_capi = clinic.limited_capi - if limited_capi and (requires_defining_class or pseudo_args or + if limited_capi and (pseudo_args or (any(p.is_optional() for p in parameters) and any(p.is_keyword_only() and not p.is_optional() for p in parameters)) or any(c.broken_limited_capi for c in converters)): @@ -1642,12 +1642,11 @@ class CLanguage(Language): declarations=declarations) + methoddef_cast_end = "" if flags in ('METH_NOARGS', 'METH_O', 'METH_VARARGS'): methoddef_cast = "(PyCFunction)" - methoddef_cast_end = "" elif limited_capi: methoddef_cast = "(PyCFunction)(void(*)(void))" - methoddef_cast_end = "" else: methoddef_cast = "_PyCFunction_CAST(" methoddef_cast_end = ")" |