[Python-checkins] cpython (merge 3.3 -> default): merge

[raymond.hettinger]

http://hg.python.org/cpython/rev/7e6d03c4a367
changeset:   83901:7e6d03c4a367
parent:      83898:d0a093f40801
parent:      83900:e1d6140b02f0
user:        Raymond Hettinger <python at rcn.com>
date:        Thu May 23 00:15:19 2013 -0700
summary:
  merge

files:
  Doc/tutorial/inputoutput.rst |  4 ----
  1 files changed, 0 insertions(+), 4 deletions(-)


diff --git a/Doc/tutorial/inputoutput.rst b/Doc/tutorial/inputoutput.rst
--- a/Doc/tutorial/inputoutput.rst
+++ b/Doc/tutorial/inputoutput.rst
@@ -213,10 +213,6 @@
    >>> print('The value of PI is approximately %5.3f.' % math.pi)
    The value of PI is approximately 3.142.
 
-Since :meth:`str.format` is quite new, a lot of Python code still uses the ``%``
-operator. However, because this old style of formatting will eventually be
-removed from the language, :meth:`str.format` should generally be used.
-
 More information can be found in the :ref:`old-string-formatting` section.
 
 

-- 
Repository URL: http://hg.python.org/cpython