(original) (raw)

changeset: 102843:7924eac912fe user: Victor Stinner victor.stinner@gmail.com date: Mon Aug 22 23:17:30 2016 +0200 files: Python/ceval.c description: Issue #27809: Cleanup _PyEval_EvalCodeWithName() * Rename nm to name * PEP 7: add { ... } to if/else blocks diff -r 1aefb4c4a7b4 -r 7924eac912fe Python/ceval.c --- a/Python/ceval.c Mon Aug 22 23:15:44 2016 +0200 +++ b/Python/ceval.c Mon Aug 22 23:17:30 2016 +0200 @@ -3878,28 +3878,28 @@ normally interned this should almost always hit. */ co_varnames = ((PyTupleObject *)(co->co_varnames))->ob_item; for (j = 0; j < total_args; j++) { - PyObject *nm = co_varnames[j]; - if (nm == keyword) + PyObject *name = co_varnames[j]; + if (name == keyword) { goto kw_found; + } } /* Slow fallback, just in case */ for (j = 0; j < total_args; j++) { - PyObject *nm = co_varnames[j]; - int cmp = PyObject_RichCompareBool( - keyword, nm, Py_EQ); - if (cmp > 0) + PyObject *name = co_varnames[j]; + int cmp = PyObject_RichCompareBool( keyword, name, Py_EQ); + if (cmp > 0) { goto kw_found; - else if (cmp < 0) + } + else if (cmp < 0) { goto fail; + } } if (j >= total_args && kwdict == NULL) { PyErr_Format(PyExc_TypeError, - "%U() got an unexpected " - "keyword argument '%S'", - co->co_name, - keyword); + "%U() got an unexpected keyword argument '%S'", + co->co_name, keyword); goto fail; } @@ -3911,10 +3911,8 @@ kw_found: if (GETLOCAL(j) != NULL) { PyErr_Format(PyExc_TypeError, - "%U() got multiple " - "values for argument '%S'", - co->co_name, - keyword); + "%U() got multiple values for argument '%S'", + co->co_name, keyword); goto fail; } Py_INCREF(value); /victor.stinner@gmail.com