(original) (raw)

diff -r 846c165cf643 Lib/test/test_format.py --- a/Lib/test/test_format.py Thu Apr 02 23:07:19 2015 +0300 +++ b/Lib/test/test_format.py Fri Apr 03 09:02:09 2015 +0300 @@ -358,12 +358,12 @@ class FormatTest(unittest.TestCase): "not all arguments converted during bytes formatting") test_exc(b'no format', bytearray(b'1'), TypeError, "not all arguments converted during bytes formatting") - test_exc(b"%c", -1, TypeError, - "%c requires an integer in range(256) or a single byte") - test_exc(b"%c", 256, TypeError, - "%c requires an integer in range(256) or a single byte") - test_exc(b"%c", 2**128, TypeError, - "%c requires an integer in range(256) or a single byte") + test_exc(b"%c", -1, OverflowError, + "%c arg not in range(256)") + test_exc(b"%c", 256, OverflowError, + "%c arg not in range(256)") + test_exc(b"%c", 2**128, OverflowError, + "%c arg not in range(256)") test_exc(b"%c", b"Za", TypeError, "%c requires an integer in range(256) or a single byte") test_exc(b"%c", "Y", TypeError, diff -r 846c165cf643 Objects/bytesobject.c --- a/Objects/bytesobject.c Thu Apr 02 23:07:19 2015 +0300 +++ b/Objects/bytesobject.c Fri Apr 03 09:02:09 2015 +0300 @@ -496,10 +496,15 @@ byte_converter(PyObject *arg, char *p) ival = PyLong_AsLongAndOverflow(iobj, &overflow); Py_DECREF(iobj); } - if (!overflow && 0 <= ival && ival <= 255) { - *p = (char)ival; - return 1; + if (!overflow && ival == -1 && PyErr_Occurred()) + goto onError; + if (overflow || !(0 <= ival && ival <= 255)) { + PyErr_SetString(PyExc_OverflowError, + "%c arg not in range(256)"); + return 0; } + *p = (char)ival; + return 1; } onError: PyErr_SetString(PyExc_TypeError,