From f54d7811c3c7a204d7380cdda4fe503bc01b05fd Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Wed, 6 Jul 2016 21:39:44 +0300 Subject: [PATCH] Issue #27460: Unified error messages in bytes constructor for integers in and out of the Py_ssize_t range. Patch by Xiang Zhang. --- Objects/bytesobject.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c index 8ad27829347..1ef21cc796c 100644 --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -2624,7 +2624,7 @@ fail: \ for (i = 0; i < Py_SIZE(x); i++) { \ item = GET_ITEM((x), i); \ - value = PyNumber_AsSsize_t(item, PyExc_ValueError); \ + value = PyNumber_AsSsize_t(item, NULL); \ if (value == -1 && PyErr_Occurred()) \ goto error; \ \ @@ -2687,7 +2687,7 @@ _PyBytes_FromIterator(PyObject *it, PyObject *x) } /* Interpret it as an int (__index__) */ - value = PyNumber_AsSsize_t(item, PyExc_ValueError); + value = PyNumber_AsSsize_t(item, NULL); Py_DECREF(item); if (value == -1 && PyErr_Occurred()) goto error;