Commit 4d6795e1 authored by Ezio Melotti's avatar Ezio Melotti

#17265: merge with 3.2.

parents 79b99dba bcbc5678
...@@ -688,7 +688,7 @@ these rules. The methods of :class:`Template` are: ...@@ -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: ...@@ -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'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment