#16154: merge with 3.2. · pythoncapi/cpython@5a4b03d · GitHub
Skip to content

Commit 5a4b03d

Browse files
ezio-melottiezio-melotti
committed
python#16154: merge with 3.2.
2 parents b2b2252 + 4050792 commit 5a4b03d

5 files changed

Lines changed: 11 additions & 8 deletions

File tree

‎Doc/library/colorsys.rst‎

Lines changed: 4 additions & 4 deletions

‎Doc/library/filecmp.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,6 @@ recursively through two directories to show common different files::
176176
... for sub_dcmp in dcmp.subdirs.values():
177177
... print_diff_files(sub_dcmp)
178178
...
179-
>>> dcmp = dircmp('dir1', 'dir2')
180-
>>> print_diff_files(dcmp)
179+
>>> dcmp = dircmp('dir1', 'dir2') # doctest: +SKIP
180+
>>> print_diff_files(dcmp) # doctest: +SKIP
181181

‎Doc/library/math.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ Number-theoretic and representation functions
7777

7878

7979
.. function:: fsum(iterable)
80+
.. testsetup::
81+
>>> from math import fsum
8082

8183
Return an accurate floating point sum of values in the iterable. Avoids
8284
loss of precision by tracking multiple intermediate partial sums::

‎Doc/library/string.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ Nesting arguments and more complex examples::
610610
3232235521
611611
>>>
612612
>>> width = 5
613-
>>> for num in range(5,12):
613+
>>> for num in range(5,12): #doctest: +NORMALIZE_WHITESPACE
614614
... for base in 'dXob':
615615
... print('{0:{width}{base}}'.format(num, base=base, width=width), end=' ')
616616
... print()
@@ -698,7 +698,7 @@ Here is an example of how to use a Template:
698698
>>> Template('Give $who $100').substitute(d)
699699
Traceback (most recent call last):
700700
[...]
701-
ValueError: Invalid placeholder in string: line 1, col 10
701+
ValueError: Invalid placeholder in string: line 1, col 11
702702
>>> Template('$who likes $what').substitute(d)
703703
Traceback (most recent call last):
704704
[...]

‎Misc/ACKS‎

Lines changed: 1 addition & 0 deletions

0 commit comments

Comments
 (0)