#17265: merge with 3.2.

This commit is contained in:
Ezio Melotti 2013-02-21 12:35:40 +02:00
commit 4d6795e1a2

View File

@ -688,7 +688,7 @@ these rules. The methods of :class:`Template` are:
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 @@ Here is an example of how to use a Template:
>>> 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'