[Python-checkins] r76944 - in python/branches/release31-maint: Lib/test/test_cmath.py

[mark.dickinson]

Author: mark.dickinson
Date: Sun Dec 20 20:57:24 2009
New Revision: 76944

Log:
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
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_cmath.py

Modified: python/branches/release31-maint/Lib/test/test_cmath.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_cmath.py	(original)
+++ python/branches/release31-maint/Lib/test/test_cmath.py	Sun Dec 20 20:57:24 2009
@@ -130,8 +130,10 @@
     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