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
........
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 @@
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