From e0b4590415c2fb33581ad9e6ee472b6fe546978b Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Sun, 20 Dec 2009 19:57:24 +0000 Subject: [PATCH] Merged revisions 76943 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r76943 | mark.dickinson | 2009-12-20 19:56:09 +0000 (Sun, 20 Dec 2009) | 13 lines Merged revisions 76939,76941 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76939 | mark.dickinson | 2009-12-20 19:45:37 +0000 (Sun, 20 Dec 2009) | 1 line Issue #7554: Fix incorrect usage of rAssertAlmostEqual. Thanks Florent Xicluna. ........ r76941 | mark.dickinson | 2009-12-20 19:52:36 +0000 (Sun, 20 Dec 2009) | 1 line Fix for consistency with py3k keyword-only version of assertAlmostEqual ........ ................ --- Lib/test/test_cmath.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_cmath.py b/Lib/test/test_cmath.py index 2d2defffdcb..2ab5a78a22a 100755 --- a/Lib/test/test_cmath.py +++ b/Lib/test/test_cmath.py @@ -130,8 +130,10 @@ class CMathTests(unittest.TestCase): def test_constants(self): e_expected = 2.71828182845904523536 pi_expected = 3.14159265358979323846 - self.assertAlmostEqual(cmath.pi, pi_expected) - self.assertAlmostEqual(cmath.e, e_expected) + self.assertAlmostEqual(cmath.pi, pi_expected, places=9, + msg="cmath.pi is %s; should be %s" % (cmath.pi, pi_expected)) + self.assertAlmostEqual(cmath.e, e_expected, places=9, + msg="cmath.e is %s; should be %s" % (cmath.e, e_expected)) def test_user_object(self): # Test automatic calling of __complex__ and __float__ by cmath