mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

bpo-29730: replace some calls to PyNumber_Check and improve some error messages (#650)

Browse source
This commit is contained in:
Oren Milman 2017-03-13 00:37:05 +02:00 • committed by Serhiy Storchaka
parent b7c9150b68
commit 004251059b
5 changed files with 39 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Modules/_io/stringio.c
View file

@ -458,17 +458,19 @@ _io_StringIO_truncate_impl(stringio *self, PyObject *arg)
CHECK_INITIALIZED(self);
CHECK_CLOSED(self);
if (PyNumber_Check(arg)) {
if (PyIndex_Check(arg)) {
size = PyNumber_AsSsize_t(arg, PyExc_OverflowError);
if (size == -1 && PyErr_Occurred())
if (size == -1 && PyErr_Occurred()) {
return NULL;
}
}
else if (arg == Py_None) {
/* Truncate to current position if no argument is passed. */
size = self->pos;
}
else {
PyErr_Format(PyExc_TypeError, "integer argument expected, got '%s'",
PyErr_Format(PyExc_TypeError,
"argument should be integer or None, not '%.200s'",
Py_TYPE(arg)->tp_name);
return NULL;
}