From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sun, 13 Mar 2011 00:27:26 +0000 (+0200)
Subject: Merge with 3.1.
X-Git-Tag: v3.2.1b1~318
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0def5c69070c80093af1e05266c61d053aaba3e1;p=python

Merge with 3.1.
---

0def5c69070c80093af1e05266c61d053aaba3e1
diff --cc Doc/tutorial/inputoutput.rst
index b35cc8051a,abe1ce09c0..00f5aea609
--- a/Doc/tutorial/inputoutput.rst
+++ b/Doc/tutorial/inputoutput.rst
@@@ -40,8 -40,8 +40,8 @@@ which can be read by the interpreter (o
  there is not equivalent syntax).  For objects which don't have a particular
  representation for human consumption, :func:`str` will return the same value as
  :func:`repr`.  Many values, such as numbers or structures like lists and
--dictionaries, have the same representation using either function.  Strings and
--floating point numbers, in particular, have two distinct representations.
++dictionaries, have the same representation using either function.  Strings, in
++particular, have two distinct representations.
  
  Some examples::
  
@@@ -50,9 -50,9 +50,7 @@@
     'Hello, world.'
     >>> repr(s)
     "'Hello, world.'"
--   >>> str(1.0/7.0)
--   '0.142857142857'
--   >>> repr(1.0/7.0)
++   >>> str(1/7)
     '0.14285714285714285'
     >>> x = 10 * 3.25
     >>> y = 200 * 200