From 5eaffc4ce1279cd023df68a6ee1fd1a5919bff2b Mon Sep 17 00:00:00 2001 From: Raymond Hettinger Date: Thu, 17 Apr 2008 10:48:31 +0000 Subject: [PATCH] Issue 2648: Add leading zero to money format recipe in the docs. --- Doc/library/decimal.rst | 4 +++- Doc/library/itertools.rst | 14 +++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Doc/library/decimal.rst b/Doc/library/decimal.rst index a79272f5e41..a792f411337 100644 --- a/Doc/library/decimal.rst +++ b/Doc/library/decimal.rst @@ -1426,7 +1426,7 @@ to work with the :class:`Decimal` class:: >>> moneyfmt(Decimal(123456789), sep=' ') '123 456 789.00' >>> moneyfmt(Decimal('-0.02'), neg='<', trailneg='>') - '<.02>' + '<0.02>' """ q = Decimal(10) ** -places # 2 places --> '0.01' @@ -1439,6 +1439,8 @@ to work with the :class:`Decimal` class:: for i in range(places): build(next() if digits else '0') build(dp) + if not digits: + build('0') i = 0 while digits: build(next()) diff --git a/Doc/library/itertools.rst b/Doc/library/itertools.rst index 4a4db2927c6..7d7c6ca3729 100644 --- a/Doc/library/itertools.rst +++ b/Doc/library/itertools.rst @@ -98,7 +98,7 @@ loops that truncate the stream. .. function:: combinations(iterable, r) - Return successive *r* length combinations of elements in the *iterable*. + Return *r* length subsequences of elements from the input *iterable*. Combinations are emitted in lexicographic sort order. So, if the input *iterable* is sorted, the combination tuples will be produced @@ -108,9 +108,6 @@ loops that truncate the stream. value. So if the input elements are unique, there will be no repeat values in each combination. - Each result tuple is ordered to match the input order. So, every - combination is a subsequence of the input *iterable*. - Equivalent to:: def combinations(iterable, r): @@ -446,11 +443,10 @@ loops that truncate the stream. Equivalent to nested for-loops in a generator expression. For example, ``product(A, B)`` returns the same as ``((x,y) for x in A for y in B)``. - The leftmost iterators correspond to the outermost for-loop, so the output - tuples cycle like an odometer (with the rightmost element changing on every - iteration). This results in a lexicographic ordering so that if the - inputs iterables are sorted, the product tuples are emitted - in sorted order. + The nested loops cycle like an odometer with the rightmost element advancing + on every iteration. This pattern creats a lexicographic ordering so that if + the inputs iterables are sorted, the product tuples are emitted in sorted + order. To compute the product of an iterable with itself, specify the number of repetitions with the optional *repeat* keyword argument. For example,