From 0d2ab8be699eb77ecce17bbfa4e458b6552c6316 Mon Sep 17 00:00:00 2001 From: Benedikt Werner <1benediktwerner@gmail.com> Date: Tue, 22 Jan 2019 14:46:34 +0100 Subject: [PATCH 1/3] Fix table formatting in itertools doc --- Doc/library/itertools.rst | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Doc/library/itertools.rst b/Doc/library/itertools.rst index b1513cd8b1b909d..9134aa34e82798d 100644 --- a/Doc/library/itertools.rst +++ b/Doc/library/itertools.rst @@ -70,12 +70,17 @@ Iterator Arguments Resu :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 -``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`` -``combinations('ABCD', 2)`` ``AB AC AD BC BD CD`` -``combinations_with_replacement('ABCD', 2)`` ``AA AB AC AD BB BC BD CC CD DD`` ============================================== ==================== ============================================================= +============================================== ============================================================= +Examples Results +============================================== ============================================================= +``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`` +``combinations('ABCD', 2)`` ``AB AC AD BC BD CD`` +``combinations_with_replacement('ABCD', 2)`` ``AA AB AC AD BB BC BD CC CD DD`` +============================================== ============================================================= + .. _itertools-functions: From 4aa77019149f1a33d76b153c0cfb6bb95e35e162 Mon Sep 17 00:00:00 2001 From: Benedikt Werner <1benediktwerner@gmail.com> Date: Fri, 8 Mar 2019 22:29:16 +0100 Subject: [PATCH 2/3] Fix table widths in itertools doc --- Doc/library/itertools.rst | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Doc/library/itertools.rst b/Doc/library/itertools.rst index 9134aa34e82798d..f9161453642fb76 100644 --- a/Doc/library/itertools.rst +++ b/Doc/library/itertools.rst @@ -72,14 +72,17 @@ Iterator Arguments Resu :func:`combinations_with_replacement` p, r r-length tuples, in sorted order, with repeated elements ============================================== ==================== ============================================================= -============================================== ============================================================= -Examples Results -============================================== ============================================================= -``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`` -``combinations('ABCD', 2)`` ``AB AC AD BC BD CD`` -``combinations_with_replacement('ABCD', 2)`` ``AA AB AC AD BB BC BD CC CD DD`` -============================================== ============================================================= +.. table:: + :widths: 47 53 + + ============================================== ============================================================= + Examples Results + ============================================== ============================================================= + ``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`` + ``combinations('ABCD', 2)`` ``AB AC AD BC BD CD`` + ``combinations_with_replacement('ABCD', 2)`` ``AA AB AC AD BB BC BD CC CD DD`` + ============================================== ============================================================= .. _itertools-functions: From 1154cfec19befe8d91b1b28651e1f56cfad5a10b Mon Sep 17 00:00:00 2001 From: Raymond Hettinger Date: Wed, 20 Mar 2019 23:47:13 -0700 Subject: [PATCH 3/3] Avoid awkward line wrap --- Doc/library/itertools.rst | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/Doc/library/itertools.rst b/Doc/library/itertools.rst index f9161453642fb76..3d4e5836cf205e1 100644 --- a/Doc/library/itertools.rst +++ b/Doc/library/itertools.rst @@ -72,17 +72,14 @@ Iterator Arguments Resu :func:`combinations_with_replacement` p, r r-length tuples, in sorted order, with repeated elements ============================================== ==================== ============================================================= -.. table:: - :widths: 47 53 - - ============================================== ============================================================= - Examples Results - ============================================== ============================================================= - ``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`` - ``combinations('ABCD', 2)`` ``AB AC AD BC BD CD`` - ``combinations_with_replacement('ABCD', 2)`` ``AA AB AC AD BB BC BD CC CD DD`` - ============================================== ============================================================= +============================================== ============================================================= +Examples Results +============================================== ============================================================= +``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`` +``combinations('ABCD', 2)`` ``AB AC AD BC BD CD`` +``combinations_with_replacement('ABCD', 2)`` ``AA AB AC AD BB BC BD CC CD DD`` +============================================== ============================================================= .. _itertools-functions: