mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-02 13:22:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge

Browse source
This commit is contained in:
Raymond Hettinger 2013-01-18 17:53:18 -08:00
commit 8a7d74446c
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Modules/_heapqmodule.c
View file

@ -118,7 +118,7 @@ heappush(PyObject *self, PyObject *args)
} }
PyDoc_STRVAR(heappush_doc, PyDoc_STRVAR(heappush_doc,
"Push item onto heap, maintaining the heap invariant."); "heappush(heap, item) -> None. Push item onto heap, maintaining the heap invariant.");
static PyObject * static PyObject *
heappop(PyObject *self, PyObject *heap) heappop(PyObject *self, PyObject *heap)
@ -186,7 +186,7 @@ heapreplace(PyObject *self, PyObject *args)
} }
PyDoc_STRVAR(heapreplace_doc, PyDoc_STRVAR(heapreplace_doc,
"Pop and return the current smallest value, and add the new item.\n\ "heapreplace(heap, item) -> value. Pop and return the current smallest value, and add the new item.\n\
\n\ \n\
This is more efficient than heappop() followed by heappush(), and can be\n\ This is more efficient than heappop() followed by heappush(), and can be\n\
more appropriate when using a fixed-size heap. Note that the value\n\ more appropriate when using a fixed-size heap. Note that the value\n\
@ -233,7 +233,7 @@ heappushpop(PyObject *self, PyObject *args)
} }
PyDoc_STRVAR(heappushpop_doc, PyDoc_STRVAR(heappushpop_doc,
"Push item on the heap, then pop and return the smallest item\n\ "heappushpop(heap, item) -> value. Push item on the heap, then pop and return the smallest item\n\
from the heap. The combined action runs more efficiently than\n\ from the heap. The combined action runs more efficiently than\n\
heappush() followed by a separate call to heappop()."); heappush() followed by a separate call to heappop().");