diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2013-01-11 09:12:49 +0200 |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2013-01-11 09:12:49 +0200 |
| commit | 14af64fb381684827da63ab8fc25fdc94010ef71 (patch) | |
| tree | ddeaf21dd8c80155160ac45ab7e99fd01faa25a8 | |
| parent | 1f49c5c37e7ae93731fe5b742ec6fbc055b3bbdd (diff) | |
| parent | 5a4b03dd8207cabbcaccbc9d6a1ee4856dd793f0 (diff) | |
| download | cpython-git-14af64fb381684827da63ab8fc25fdc94010ef71.tar.gz | |
#16154: merge with 3.3.
| -rw-r--r-- | Doc/library/colorsys.rst | 8 | ||||
| -rw-r--r-- | Doc/library/filecmp.rst | 4 | ||||
| -rw-r--r-- | Doc/library/math.rst | 2 | ||||
| -rw-r--r-- | Doc/library/string.rst | 4 | ||||
| -rw-r--r-- | Misc/ACKS | 1 |
5 files changed, 11 insertions, 8 deletions
diff --git a/Doc/library/colorsys.rst b/Doc/library/colorsys.rst index dbab7063e1..225306c2d3 100644 --- a/Doc/library/colorsys.rst +++ b/Doc/library/colorsys.rst @@ -58,7 +58,7 @@ The :mod:`colorsys` module defines the following functions: Example:: >>> import colorsys - >>> colorsys.rgb_to_hsv(.3, .4, .2) - (0.25, 0.5, 0.4) - >>> colorsys.hsv_to_rgb(0.25, 0.5, 0.4) - (0.3, 0.4, 0.2) + >>> colorsys.rgb_to_hsv(0.2, 0.4, 0.4) + (0.5, 0.5, 0.4) + >>> colorsys.hsv_to_rgb(0.5, 0.5, 0.4) + (0.2, 0.4, 0.4) diff --git a/Doc/library/filecmp.rst b/Doc/library/filecmp.rst index add68a33ad..8a88f8ce9a 100644 --- a/Doc/library/filecmp.rst +++ b/Doc/library/filecmp.rst @@ -176,6 +176,6 @@ recursively through two directories to show common different files:: ... for sub_dcmp in dcmp.subdirs.values(): ... print_diff_files(sub_dcmp) ... - >>> dcmp = dircmp('dir1', 'dir2') - >>> print_diff_files(dcmp) + >>> dcmp = dircmp('dir1', 'dir2') # doctest: +SKIP + >>> print_diff_files(dcmp) # doctest: +SKIP diff --git a/Doc/library/math.rst b/Doc/library/math.rst index 62c0f34eef..b056ca430a 100644 --- a/Doc/library/math.rst +++ b/Doc/library/math.rst @@ -77,6 +77,8 @@ Number-theoretic and representation functions .. function:: fsum(iterable) +.. testsetup:: + >>> from math import fsum Return an accurate floating point sum of values in the iterable. Avoids loss of precision by tracking multiple intermediate partial sums:: diff --git a/Doc/library/string.rst b/Doc/library/string.rst index f981f4ec5a..fa8d9e47c3 100644 --- a/Doc/library/string.rst +++ b/Doc/library/string.rst @@ -610,7 +610,7 @@ Nesting arguments and more complex examples:: 3232235521 >>> >>> width = 5 - >>> for num in range(5,12): + >>> for num in range(5,12): #doctest: +NORMALIZE_WHITESPACE ... for base in 'dXob': ... print('{0:{width}{base}}'.format(num, base=base, width=width), end=' ') ... print() @@ -698,7 +698,7 @@ Here is an example of how to use a Template: >>> Template('Give $who $100').substitute(d) Traceback (most recent call last): [...] - ValueError: Invalid placeholder in string: line 1, col 10 + ValueError: Invalid placeholder in string: line 1, col 11 >>> Template('$who likes $what').substitute(d) Traceback (most recent call last): [...] @@ -1113,6 +1113,7 @@ Ionel Simionescu Kirill Simonov Nathan Paul Simons Adam Simpkins +Ravi Sinha Janne Sinkkonen Ng Pheng Siong George Sipe |