[Python-checkins] cpython (merge 3.5 -> default): Issue #16191: Merge comment fixes from 3.5
martin.panter
python-checkins at python.org
Mon Jul 18 04:38:49 EDT 2016
https://hg.python.org/cpython/rev/c10fe99afced
changeset: 102400:c10fe99afced
parent: 102398:646ad4894c32
parent: 102399:6cf4386de3cc
user: Martin Panter <vadmium+py at gmail.com>
date: Mon Jul 18 08:25:01 2016 +0000
summary:
Issue #16191: Merge comment fixes from 3.5
files:
Python/ceval.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Python/ceval.c b/Python/ceval.c
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1565,7 +1565,7 @@
if (PyUnicode_CheckExact(left) &&
PyUnicode_CheckExact(right)) {
sum = unicode_concatenate(left, right, f, next_instr);
- /* unicode_concatenate consumed the ref to v */
+ /* unicode_concatenate consumed the ref to left */
}
else {
sum = PyNumber_Add(left, right);
@@ -1764,7 +1764,7 @@
PyObject *sum;
if (PyUnicode_CheckExact(left) && PyUnicode_CheckExact(right)) {
sum = unicode_concatenate(left, right, f, next_instr);
- /* unicode_concatenate consumed the ref to v */
+ /* unicode_concatenate consumed the ref to left */
}
else {
sum = PyNumber_InPlaceAdd(left, right);
@@ -1855,7 +1855,7 @@
PyObject *v = THIRD();
int err;
STACKADJ(-3);
- /* v[w] = u */
+ /* container[sub] = v */
err = PyObject_SetItem(container, sub, v);
Py_DECREF(v);
Py_DECREF(container);
@@ -1870,7 +1870,7 @@
PyObject *container = SECOND();
int err;
STACKADJ(-2);
- /* del v[w] */
+ /* del container[sub] */
err = PyObject_DelItem(container, sub);
Py_DECREF(container);
Py_DECREF(sub);
@@ -2113,7 +2113,7 @@
SET_TOP(val);
DISPATCH();
}
- /* x remains on stack, retval is value to be yielded */
+ /* receiver remains on stack, retval is value to be yielded */
f->f_stacktop = stack_pointer;
why = WHY_YIELD;
/* and repeat... */
@@ -2773,7 +2773,7 @@
STACKADJ(-2);
map = stack_pointer[-oparg]; /* dict */
assert(PyDict_CheckExact(map));
- err = PyDict_SetItem(map, key, value); /* v[w] = u */
+ err = PyDict_SetItem(map, key, value); /* map[key] = value */
Py_DECREF(value);
Py_DECREF(key);
if (err != 0)
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list