From: R. David Murray <rdmurray@bitdance.com>
Date: Mon, 23 Nov 2009 03:14:51 +0000 (+0000)
Subject: Merged revisions 76448 via svnmerge from
X-Git-Tag: v3.1.2rc1~314
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4c3805958fd55443266db80eddca5102729bcedd;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 76448 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r76448 | r.david.murray | 2009-11-22 22:13:23 -0500 (Sun, 22 Nov 2009) | 4 lines

  Update example in doctest chapter that uses math.floor to reflect the
  fact that the result is an int in py3k.  Thanks to 'flox' for pointing out
  the discrepancy.
........
---

diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst
index 2aa3ae163f1a..4952e053bd94 100644
--- a/Doc/library/doctest.rst
+++ b/Doc/library/doctest.rst
@@ -343,7 +343,7 @@ The fine print:
      >>> assert "Easy!"
            >>> import math
                >>> math.floor(1.9)
-               1.0
+               1
 
   and as many leading whitespace characters are stripped from the expected output
   as appeared in the initial ``'>>> '`` line that started the example.