mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 10:45:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

bpo-29852: Argument Clinic Py_ssize_t converter now supports None (#716)

Browse source 
if pass `accept={int, NoneType}`.
This commit is contained in:
Serhiy Storchaka 2017-03-30 09:15:31 +03:00 • committed by GitHub
parent ea720fe7e9
commit 762bf40438
20 changed files with 98 additions and 200 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Modules/mmapmodule.c
View file

@ -240,29 +240,6 @@ mmap_read_line_method(mmap_object *self,
return result;
}
/* Basically the "n" format code with the ability to turn None into -1. */
static int
mmap_convert_ssize_t(PyObject *obj, void *result) {
Py_ssize_t limit;
if (obj == Py_None) {
limit = -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;
}
static PyObject *
mmap_read_method(mmap_object *self,
PyObject *args)
@ -271,7 +248,7 @@ mmap_read_method(mmap_object *self,
PyObject *result;
CHECK_VALID(NULL);
if (!PyArg_ParseTuple(args, "|O&:read", mmap_convert_ssize_t, &num_bytes))
if (!PyArg_ParseTuple(args, "|O&:read", _Py_convert_optional_to_ssize_t, &num_bytes))
return(NULL);
/* silently 'adjust' out-of-range requests */