summaryrefslogtreecommitdiff
path: root/Modules/_heapqmodule.c
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2013-03-11 17:45:12 -0400
committerTerry Jan Reedy <tjreedy@udel.edu>2013-03-11 17:45:12 -0400
commit09b7503bc999b2c65c9d61465cd19758ff97c0c4 (patch)
treee0dc4cbc6a25962c2fc98ba30128cb8691134739 /Modules/_heapqmodule.c
parentcaeb6bea9bd52859bceae8437bd931335aacad94 (diff)
parent0158af38b73b76516f18b1774e1c590f459cb188 (diff)
downloadcpython-git-09b7503bc999b2c65c9d61465cd19758ff97c0c4.tar.gz
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.c4
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);