Issue #29044: Merge 3.6.

This commit is contained in:
Xiang Zhang 2016-12-22 15:31:55 +08:00
commit 62497d52d9

View file

@ -14286,11 +14286,12 @@ formatchar(PyObject *v)
if (iobj == NULL) {
goto onError;
}
v = iobj;
x = PyLong_AsLong(iobj);
Py_DECREF(iobj);
}
/* Integer input truncated to a character */
x = PyLong_AsLong(v);
else {
x = PyLong_AsLong(v);
}
if (x == -1 && PyErr_Occurred())
goto onError;