From d1cc39d3d833289e924c8ded75f6cc94dc4cc5a5 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Sun, 28 Jun 2009 21:00:42 +0000 Subject: [PATCH] Merged revisions 73636 via svnmerge from svn+ssh://pythondev@www.python.org/python/branches/py3k ........ r73636 | mark.dickinson | 2009-06-28 21:59:42 +0100 (Sun, 28 Jun 2009) | 2 lines Issue #6354: More fixes for code examples involving the repr of a float. ........ --- Doc/library/math.rst | 2 +- Doc/library/sqlite3.rst | 4 ++-- Doc/library/turtle.rst | 2 +- Doc/tutorial/inputoutput.rst | 8 ++++---- Doc/tutorial/introduction.rst | 2 +- Doc/tutorial/stdlib2.rst | 8 ++++---- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Doc/library/math.rst b/Doc/library/math.rst index 649487ffeb9..488230ad122 100644 --- a/Doc/library/math.rst +++ b/Doc/library/math.rst @@ -82,7 +82,7 @@ Number-theoretic and representation functions loss of precision by tracking multiple intermediate partial sums:: >>> sum([.1, .1, .1, .1, .1, .1, .1, .1, .1, .1]) - 0.99999999999999989 + 0.9999999999999999 >>> fsum([.1, .1, .1, .1, .1, .1, .1, .1, .1, .1]) 1.0 diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst index 6c3f6e2d206..53164b8ba13 100644 --- a/Doc/library/sqlite3.rst +++ b/Doc/library/sqlite3.rst @@ -81,7 +81,7 @@ This example uses the iterator form:: >>> for row in c: ... print(row) ... - (u'2006-01-05', u'BUY', u'RHAT', 100, 35.140000000000001) + (u'2006-01-05', u'BUY', u'RHAT', 100, 35.14) (u'2006-03-28', u'BUY', u'IBM', 1000, 45.0) (u'2006-04-06', u'SELL', u'IBM', 500, 53.0) (u'2006-04-05', u'BUY', u'MSOFT', 1000, 72.0) @@ -591,7 +591,7 @@ Now we plug :class:`Row` in:: >>> type(r) >>> r - (u'2006-01-05', u'BUY', u'RHAT', 100.0, 35.140000000000001) + (u'2006-01-05', u'BUY', u'RHAT', 100.0, 35.14) >>> len(r) 5 >>> r[2] diff --git a/Doc/library/turtle.rst b/Doc/library/turtle.rst index 9070107f7d9..b7f285333dd 100644 --- a/Doc/library/turtle.rst +++ b/Doc/library/turtle.rst @@ -881,7 +881,7 @@ Color control >>> tup = (0.2, 0.8, 0.55) >>> turtle.pencolor(tup) >>> turtle.pencolor() - (0.20000000000000001, 0.80000000000000004, 0.5490196078431373) + (0.2, 0.8, 0.5490196078431373) >>> colormode(255) >>> turtle.pencolor() (51, 204, 140) diff --git a/Doc/tutorial/inputoutput.rst b/Doc/tutorial/inputoutput.rst index eabf662519d..b1efd1a9298 100644 --- a/Doc/tutorial/inputoutput.rst +++ b/Doc/tutorial/inputoutput.rst @@ -52,10 +52,10 @@ Some examples:: 'Hello, world.' >>> repr(s) "'Hello, world.'" - >>> str(0.1) - '0.1' - >>> repr(0.1) - '0.10000000000000001' + >>> str(1.0/7.0) + '0.142857142857' + >>> repr(1.0/7.0) + '0.14285714285714285' >>> x = 10 * 3.25 >>> y = 200 * 200 >>> s = 'The value of x is ' + repr(x) + ', and y is ' + repr(y) + '...' diff --git a/Doc/tutorial/introduction.rst b/Doc/tutorial/introduction.rst index 3757fc37719..1b3faae64b3 100644 --- a/Doc/tutorial/introduction.rst +++ b/Doc/tutorial/introduction.rst @@ -56,7 +56,7 @@ operators ``+``, ``-``, ``*`` and ``/`` work just like in most other languages >>> (50-5*6)/4 5.0 >>> 8/5 # Fractions aren't lost when dividing integers - 1.6000000000000001 + 1.6 Note: You might not see exactly the same result; floating point results can differ from one machine to another. We will say more later about controlling diff --git a/Doc/tutorial/stdlib2.rst b/Doc/tutorial/stdlib2.rst index 4be32751720..d17b0312163 100644 --- a/Doc/tutorial/stdlib2.rst +++ b/Doc/tutorial/stdlib2.rst @@ -359,10 +359,10 @@ results in decimal floating point and binary floating point. The difference becomes significant if the results are rounded to the nearest cent:: >>> from decimal import * - >>> Decimal('0.70') * Decimal('1.05') - Decimal("0.7350") - >>> .70 * 1.05 - 0.73499999999999999 + >>> round(Decimal('0.70') * Decimal('1.05'), 2) + Decimal('0.74') + >>> round(.70 * 1.05, 2) + 0.73 The :class:`Decimal` result keeps a trailing zero, automatically inferring four place significance from multiplicands with two place significance. Decimal