commit 438106b66ef4d65746ddecfee3441eb4e20e679b
author Victor Stinner <victor.stinner@gmail.com> Wed May 02 00:41:57 2012 +0200
committer Victor Stinner <victor.stinner@gmail.com> Wed May 02 00:41:57 2012 +0200
tree 6e1902b37555bc91049620a5e10801b011039740
parent b5c3ea3af35e1b55079ac8018e52935f3a43d032

Issue #14687: Cleanup PyUnicode_Format()

Objects/unicodeobject.c

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 95993e8..1d85d5b 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -13719,7 +13719,8 @@
             PyObject *signobj = NULL, *fillobj = NULL;
 
             fmtpos++;
-            if (PyUnicode_READ(fmtkind, fmt, fmtpos) == '(') {
+            c = PyUnicode_READ(fmtkind, fmt, fmtpos);
+            if (c == '(') {
                 Py_ssize_t keystart;
                 Py_ssize_t keylen;
                 PyObject *key;
@@ -13765,7 +13766,8 @@
                 argidx = -2;
             }
             while (--fmtcnt >= 0) {
-                switch (c = PyUnicode_READ(fmtkind, fmt, fmtpos++)) {
+                c = PyUnicode_READ(fmtkind, fmt, fmtpos++);
+                switch (c) {
                 case '-': flags |= F_LJUST; continue;
                 case '+': flags |= F_SIGN; continue;
                 case ' ': flags |= F_BLANK; continue;