Issue #29044: Merge 3.5.

This commit is contained in:
Xiang Zhang 2016-12-22 15:31:22 +08:00
commit 437a5d2c25
1 changed files with 4 additions and 3 deletions

View File

@ -14324,11 +14324,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;