diff options
| author | Raymond Hettinger <python@rcn.com> | 2009-11-19 01:23:41 (GMT) |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2009-11-19 01:23:41 (GMT) |
| commit | d3a77c0ad3d933f9ce6f3e8e6c983bfb47e89b8e (patch) | |
| tree | f680460e1ef7cb86afb205cb6f10894413fc2f3c | |
| parent | b868e63443d86d9016679b6451fd143717ab6de7 (diff) | |
| download | cpython-d3a77c0ad3d933f9ce6f3e8e6c983bfb47e89b8e.zip cpython-d3a77c0ad3d933f9ce6f3e8e6c983bfb47e89b8e.tar.gz cpython-d3a77c0ad3d933f9ce6f3e8e6c983bfb47e89b8e.tar.bz2 | |
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 c1f8d9a..3003552 100644 --- a/Doc/library/itertools.rst +++ b/Doc/library/itertools.rst @@ -65,8 +65,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 1df9782..3264d1f 100644 --- a/Modules/itertoolsmodule.c +++ b/Modules/itertoolsmodule.c @@ -2017,7 +2017,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)"); @@ -2262,7 +2262,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\ @@ -3494,8 +3494,8 @@ zip_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\ "); |