summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2013-01-19 01:53:18 (GMT)
committerRaymond Hettinger <python@rcn.com>2013-01-19 01:53:18 (GMT)
commit8a7d74446c121db18bbec03aa86ce3ebd2483e50 (patch)
treecf74b0e4e0d38e12c5fa044c9ae926cf96e208f2
parente638168e981e19c66900c9d495334c53653d78f9 (diff)
parentbd8f29028eab752e8e5c73703218a701028c1a9a (diff)
downloadcpython-8a7d74446c121db18bbec03aa86ce3ebd2483e50.zip
cpython-8a7d74446c121db18bbec03aa86ce3ebd2483e50.tar.gz
cpython-8a7d74446c121db18bbec03aa86ce3ebd2483e50.tar.bz2
merge
-rw-r--r--Modules/_heapqmodule.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/_heapqmodule.c b/Modules/_heapqmodule.c
index 1066f94..c8db509 100644
--- a/Modules/_heapqmodule.c
+++ b/Modules/_heapqmodule.c
@@ -118,7 +118,7 @@ heappush(PyObject *self, PyObject *args)
}
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 *
heappop(PyObject *self, PyObject *heap)
@@ -186,7 +186,7 @@ heapreplace(PyObject *self, PyObject *args)
}
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\
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\
@@ -233,7 +233,7 @@ heappushpop(PyObject *self, PyObject *args)
}
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\
heappush() followed by a separate call to heappop().");