[Python-checkins] cpython (merge 3.3 -> default): #16154: merge with 3.3.

[ezio.melotti]

http://hg.python.org/cpython/rev/5ec8daab477a
changeset:   81399:5ec8daab477a
parent:      81394:860a2f6282c4
parent:      81398:3e884b3804b3
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Jan 11 09:12:49 2013 +0200
summary:
  #16154: merge with 3.3.

files:
  Doc/library/colorsys.rst |  8 ++++----
  Doc/library/filecmp.rst  |  4 ++--
  Doc/library/math.rst     |  2 ++
  Doc/library/string.rst   |  4 ++--
  Misc/ACKS                |  1 +
  5 files changed, 11 insertions(+), 8 deletions(-)


diff --git a/Doc/library/colorsys.rst b/Doc/library/colorsys.rst
--- a/Doc/library/colorsys.rst
+++ b/Doc/library/colorsys.rst
@@ -58,7 +58,7 @@
 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
--- a/Doc/library/filecmp.rst
+++ b/Doc/library/filecmp.rst
@@ -176,6 +176,6 @@
     ...     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
--- a/Doc/library/math.rst
+++ b/Doc/library/math.rst
@@ -77,6 +77,8 @@
 
 
 .. 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
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -610,7 +610,7 @@
    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 @@
    >>> 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):
    [...]
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1113,6 +1113,7 @@
 Kirill Simonov
 Nathan Paul Simons
 Adam Simpkins
+Ravi Sinha
 Janne Sinkkonen
 Ng Pheng Siong
 George Sipe

-- 
Repository URL: http://hg.python.org/cpython