[Python-checkins] cpython (merge 3.2 -> 3.3): #17265: merge with 3.2.

Thu Feb 21 11:36:14 CET 2013

http://hg.python.org/cpython/rev/0e2d89f34ae5
changeset: 82294:0e2d89f34ae5
branch: 3.3
parent: 82290:1bcddc0a3765
parent: 82293:1b9de5788698
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Thu Feb 21 12:35:40 2013 +0200
summary:
 #17265: merge with 3.2.
files:
 Doc/library/string.rst | 6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Doc/library/string.rst b/Doc/library/string.rst
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -688,7 +688,7 @@
 This is the object passed to the constructor's *template* argument. In
 general, you shouldn't change it, but read-only access is not enforced.
 
-Here is an example of how to use a Template:
+Here is an example of how to use a Template::
 
 >>> from string import Template
 >>> s = Template('$who likes $what')
@@ -697,11 +697,11 @@
 >>> d = dict(who='tim')
 >>> Template('Give $who 100ドル').substitute(d)
 Traceback (most recent call last):
- [...]
+ ...
 ValueError: Invalid placeholder in string: line 1, col 11
 >>> Template('$who likes $what').substitute(d)
 Traceback (most recent call last):
- [...]
+ ...
 KeyError: 'what'
 >>> Template('$who likes $what').safe_substitute(d)
 'tim likes $what'
-- 
Repository URL: http://hg.python.org/cpython
