diff options
| author | Raymond Hettinger <python@rcn.com> | 2009-11-19 01:22:04 +0000 |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2009-11-19 01:22:04 +0000 |
| commit | 9eac119ba8f9fd6d76b75689baaa656a979cc260 (patch) | |
| tree | 601bce2ff8536ec5fb2c1b7d176159f61918f10b | |
| parent | 79628d311f3a3fcace6b08387d3d402262790bee (diff) | |
| download | cpython-git-9eac119ba8f9fd6d76b75689baaa656a979cc260.tar.gz | |
Fix docstrings for itertools combinatoric functions.
| -rw-r--r-- | Doc/library/itertools.rst | 4 | ||||
| -rw-r--r-- | Modules/itertoolsmodule.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Doc/library/itertools.rst b/Doc/library/itertools.rst index eb6306ff2c..f8d9d2617c 100644 --- a/Doc/library/itertools.rst +++ b/Doc/library/itertools.rst @@ -71,8 +71,8 @@ Iterator Arguments Resu ============================================== ==================== ============================================================= :func:`product` p, q, ... [repeat=1] cartesian product, equivalent to a nested for-loop :func:`permutations` p[, r] r-length tuples, all possible orderings, no repeated elements -:func:`combinations` p[, r] r-length tuples, in sorted order, no repeated elements -:func:`combinations_with_replacement` p[, r] r-length tuples, in sorted order, with repeated elements +:func:`combinations` p, r r-length tuples, in sorted order, no repeated elements +:func:`combinations_with_replacement` p, r r-length tuples, in sorted order, with repeated elements | ``product('ABCD', repeat=2)`` ``AA AB AC AD BA BB BC BD CA CB CC CD DA DB DC DD`` ``permutations('ABCD', 2)`` ``AB AC AD BA BC BD CA CB CD DA DB DC`` diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c index f12d874ea1..1a0d44dfc7 100644 --- a/Modules/itertoolsmodule.c +++ b/Modules/itertoolsmodule.c @@ -2196,7 +2196,7 @@ empty: } PyDoc_STRVAR(combinations_doc, -"combinations(iterable[, r]) --> combinations object\n\ +"combinations(iterable, r) --> combinations object\n\ \n\ Return successive r-length combinations of elements in the iterable.\n\n\ combinations(range(4), 3) --> (0,1,2), (0,1,3), (0,2,3), (1,2,3)"); @@ -2441,7 +2441,7 @@ empty: } PyDoc_STRVAR(cwr_doc, -"combinations_with_replacement(iterable[, r]) --> combinations_with_replacement object\n\ +"combinations_with_replacement(iterable, r) --> combinations_with_replacement object\n\ \n\ Return successive r-length combinations of elements in the iterable\n\ allowing individual elements to have successive repeats.\n\ @@ -4018,8 +4018,8 @@ izip_longest(p, q, ...) --> (p[0], q[0]), (p[1], q[1]), ... \n\ Combinatoric generators:\n\ product(p, q, ... [repeat=1]) --> cartesian product\n\ permutations(p[, r])\n\ -combinations(p[, r])\n\ -combinations_with_replacement(p[, r])\n\ +combinations(p, r)\n\ +combinations_with_replacement(p, r)\n\ "); |