mirror of
https://github.com/python/cpython.git
synced 2025-09-26 10:19:53 +00:00
Issue #29044: Merge 3.6.
This commit is contained in:
commit
62497d52d9
1 changed files with 4 additions and 3 deletions
|
@ -14286,11 +14286,12 @@ formatchar(PyObject *v)
|
||||||
if (iobj == NULL) {
|
if (iobj == NULL) {
|
||||||
goto onError;
|
goto onError;
|
||||||
}
|
}
|
||||||
v = iobj;
|
x = PyLong_AsLong(iobj);
|
||||||
Py_DECREF(iobj);
|
Py_DECREF(iobj);
|
||||||
}
|
}
|
||||||
/* Integer input truncated to a character */
|
else {
|
||||||
x = PyLong_AsLong(v);
|
x = PyLong_AsLong(v);
|
||||||
|
}
|
||||||
if (x == -1 && PyErr_Occurred())
|
if (x == -1 && PyErr_Occurred())
|
||||||
goto onError;
|
goto onError;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue