commit 004251059b9c5e48d47cb30b94bcb92cb44d3adf
author Oren Milman <orenmn@gmail.com> Mon Mar 13 00:37:05 2017 +0200
committer Serhiy Storchaka <storchaka@gmail.com> Mon Mar 13 00:37:05 2017 +0200
tree c61cee2b14c069cf40ce39910980d338687f4bc7
parent b7c9150b68516878175e5373983189d6deea470c

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

Modules/_io/stringio.c

diff --git a/Modules/_io/stringio.c b/Modules/_io/stringio.c
index 788dcb1..a73171f 100644
--- a/Modules/_io/stringio.c
+++ b/Modules/_io/stringio.c
@@ -458,17 +458,19 @@
     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;
     }