diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2013-03-11 21:45:12 (GMT) |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2013-03-11 21:45:12 (GMT) |
| commit | 09b7503bc999b2c65c9d61465cd19758ff97c0c4 (patch) | |
| tree | e0dc4cbc6a25962c2fc98ba30128cb8691134739 /Modules/_heapqmodule.c | |
| parent | caeb6bea9bd52859bceae8437bd931335aacad94 (diff) | |
| parent | 0158af38b73b76516f18b1774e1c590f459cb188 (diff) | |
| download | cpython-09b7503bc999b2c65c9d61465cd19758ff97c0c4.zip cpython-09b7503bc999b2c65c9d61465cd19758ff97c0c4.tar.gz cpython-09b7503bc999b2c65c9d61465cd19758ff97c0c4.tar.bz2 | |
Merge 3.2, Issue #17047: remove doubled words found in 2.7 to 3.4
Modules/*, as reported by Serhiy Storchaka and Matthew Barnett.
Diffstat (limited to 'Modules/_heapqmodule.c')
| -rw-r--r-- | Modules/_heapqmodule.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_heapqmodule.c b/Modules/_heapqmodule.c index 0fe64ce..f377e9c 100644 --- a/Modules/_heapqmodule.c +++ b/Modules/_heapqmodule.c @@ -116,7 +116,7 @@ _siftup(PyListObject *heap, Py_ssize_t pos) } } - /* The leaf at pos is empty now. Put newitem there, and and bubble + /* The leaf at pos is empty now. Put newitem there, and bubble it up to its final resting place (by sifting its parents down). */ Py_DECREF(PyList_GET_ITEM(heap, pos)); PyList_SET_ITEM(heap, pos, newitem); @@ -456,7 +456,7 @@ _siftupmax(PyListObject *heap, Py_ssize_t pos) childpos = 2*pos + 1; } - /* The leaf at pos is empty now. Put newitem there, and and bubble + /* The leaf at pos is empty now. Put newitem there, and bubble it up to its final resting place (by sifting its parents down). */ Py_DECREF(PyList_GET_ITEM(heap, pos)); PyList_SET_ITEM(heap, pos, newitem); |