From 762bf40438a572a398e500c74e38f9894ea20a45 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Thu, 30 Mar 2017 09:15:31 +0300 Subject: bpo-29852: Argument Clinic Py_ssize_t converter now supports None (#716) if pass `accept={int, NoneType}`. --- Python/modsupport.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'Python/modsupport.c') diff --git a/Python/modsupport.c b/Python/modsupport.c index 9637191feb..8a77a7b06d 100644 --- a/Python/modsupport.c +++ b/Python/modsupport.c @@ -12,6 +12,31 @@ static PyObject **va_build_stack(PyObject **small_stack, Py_ssize_t small_stack_ /* Package context -- the full module name for package imports */ const char *_Py_PackageContext = NULL; + +int +_Py_convert_optional_to_ssize_t(PyObject *obj, void *result) +{ + Py_ssize_t limit; + if (obj == Py_None) { + return 1; + } + else if (PyIndex_Check(obj)) { + limit = PyNumber_AsSsize_t(obj, PyExc_OverflowError); + if (limit == -1 && PyErr_Occurred()) { + return 0; + } + } + else { + PyErr_Format(PyExc_TypeError, + "argument should be integer or None, not '%.200s'", + Py_TYPE(obj)->tp_name); + return 0; + } + *((Py_ssize_t *)result) = limit; + return 1; +} + + /* Helper for mkvalue() to scan the length of a format */ static Py_ssize_t -- cgit v1.2.1