diff options
author | Terry Jan Reedy <tjreedy@udel.edu> | 2013-03-11 17:46:07 -0400 |
---|---|---|
committer | Terry Jan Reedy <tjreedy@udel.edu> | 2013-03-11 17:46:07 -0400 |
commit | 16c41d8520b7993cffa576f9021ff712d80ab825 (patch) | |
tree | cb0319c11f86a181a133cb8e98daf465175cb278 /Modules/_heapqmodule.c | |
parent | dd61f8f3899a0c4019d9201c5bd37e65becbdd5b (diff) | |
parent | 09b7503bc999b2c65c9d61465cd19758ff97c0c4 (diff) | |
download | cpython-git-16c41d8520b7993cffa576f9021ff712d80ab825.tar.gz |
Merge 3.3, 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 0fe64ce9dc..f377e9cf6c 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); |