Issue #29044: Merge 3.5.

437a5d2c · Xiang Zhang · 0ba0defb · ea1cf870 · 437a5d2c
Kaydet (Commit) 437a5d2c authored Ara 22, 2016 tarafından Xiang Zhang
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

unicodeobject.c Objects/unicodeobject.c +3 -2

No files found.
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -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 */
+        else {
            x = PyLong_AsLong(v);
+        }
        if (x == -1 && PyErr_Occurred())
            goto onError;