Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

#17265: merge with 3.3.

This commit is contained in:
Ezio Melotti 2013-02-21 12:35:57 +02:00
parent d8bc0a3693 4d6795e1a2
commit 542b7d1f15
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Doc/library/string.rst
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 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. 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 >>> from string import Template
>>> s = Template('$who likes $what') >>> s = Template('$who likes $what')
@ -697,11 +697,11 @@ Here is an example of how to use a Template:
>>> d = dict(who='tim') >>> d = dict(who='tim')
>>> Template('Give $who $100').substitute(d) >>> Template('Give $who $100').substitute(d)
Traceback (most recent call last): Traceback (most recent call last):
[...] ...
ValueError: Invalid placeholder in string: line 1, col 11 ValueError: Invalid placeholder in string: line 1, col 11
>>> Template('$who likes $what').substitute(d) >>> Template('$who likes $what').substitute(d)
Traceback (most recent call last): Traceback (most recent call last):
[...] ...
KeyError: 'what' KeyError: 'what'
>>> Template('$who likes $what').safe_substitute(d) >>> Template('$who likes $what').safe_substitute(d)
'tim likes $what' 'tim likes $what'