diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2013-01-11 07:12:28 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2013-01-11 07:12:28 (GMT) |
| commit | 5a4b03dd8207cabbcaccbc9d6a1ee4856dd793f0 (patch) | |
| tree | 7f7d82c9f763890fafc56859ecd69a85ef5102ea /Doc/library/string.rst | |
| parent | b2b2252a810bced56ff8228ea99b0935e08e4e56 (diff) | |
| parent | 405079213b7b35145ec5a437cd8b99528c3e4841 (diff) | |
| download | cpython-5a4b03dd8207cabbcaccbc9d6a1ee4856dd793f0.zip cpython-5a4b03dd8207cabbcaccbc9d6a1ee4856dd793f0.tar.gz cpython-5a4b03dd8207cabbcaccbc9d6a1ee4856dd793f0.tar.bz2 | |
#16154: merge with 3.2.
Diffstat (limited to 'Doc/library/string.rst')
| -rw-r--r-- | Doc/library/string.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/string.rst b/Doc/library/string.rst index f981f4e..fa8d9e4 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): [...] |