summaryrefslogtreecommitdiffstats
path: root/Doc/tutorial/controlflow.rst
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-05-26 01:03:56 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-05-26 01:03:56 (GMT)
commite6f00637be87c8f5f0e50bf317d684ea421a6d19 (patch)
tree72af08d6c7d328792bce581755aa38c24969b6bd /Doc/tutorial/controlflow.rst
parentdc6c16ac634eef50ba819adea2eed74651530197 (diff)
downloadcpython-e6f00637be87c8f5f0e50bf317d684ea421a6d19.zip
cpython-e6f00637be87c8f5f0e50bf317d684ea421a6d19.tar.gz
cpython-e6f00637be87c8f5f0e50bf317d684ea421a6d19.tar.bz2
Merged revisions 63655 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r63655 | benjamin.peterson | 2008-05-25 19:54:22 -0500 (Sun, 25 May 2008) | 2 lines update the tutorial to use str.format ........
Diffstat (limited to 'Doc/tutorial/controlflow.rst')
-rw-r--r--Doc/tutorial/controlflow.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst
index dee6e7c..280c028 100644
--- a/Doc/tutorial/controlflow.rst
+++ b/Doc/tutorial/controlflow.rst
@@ -475,8 +475,8 @@ called with an arbitrary number of arguments. These arguments will be wrapped
up in a tuple. Before the variable number of arguments, zero or more normal
arguments may occur. ::
- def fprintf(file, format, *args):
- file.write(format % args)
+ def fprintf(file, template, *args):
+ file.write(template.format(args))
Normally, these ``variadic`` arguments will be last in the list of formal