Issue #29044: Merge 3.5.

zhangyangyu · zhangyangyu · commit bc4a52d02bc6 · 2016-12-22T15:31:22.000+08:00
diff --git 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 */
-        x = PyLong_AsLong(v);
+        else {
+            x = PyLong_AsLong(v);
+        }
         if (x == -1 && PyErr_Occurred())
             goto onError;
 
