From e57950fbfef77f327d79a73955b42e3696ecf9f0 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Mon, 21 Apr 2008 13:08:03 +0000 Subject: Merged revisions 62420-62421,62423-62424 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62420 | mark.dickinson | 2008-04-20 20:30:05 +0200 (Sun, 20 Apr 2008) | 3 lines Even more fixes for alpha Tru64, this time for the phase and polar methods. ........ r62421 | mark.dickinson | 2008-04-20 22:38:48 +0200 (Sun, 20 Apr 2008) | 2 lines Add test for tanh(-0.) == -0. on IEEE 754 systems ........ r62423 | amaury.forgeotdarc | 2008-04-20 23:02:21 +0200 (Sun, 20 Apr 2008) | 3 lines Correct an apparent refleak in test_pkgutil: zipimport._zip_directory_cache contains info for all processed zip files, even when they are no longer used. ........ r62424 | mark.dickinson | 2008-04-20 23:39:04 +0200 (Sun, 20 Apr 2008) | 4 lines math.atan2 is misbehaving on Windows; this patch should fix the problem in the same way that the cmath.phase problems were fixed. ........ --- Modules/cmathmodule.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'Modules/cmathmodule.c') diff --git a/Modules/cmathmodule.c b/Modules/cmathmodule.c index 347f88d9f8..d6d1f27cb0 100644 --- a/Modules/cmathmodule.c +++ b/Modules/cmathmodule.c @@ -264,7 +264,8 @@ c_atan(Py_complex z) return r; } -/* Windows screws up atan2 for inf and nan */ +/* Windows screws up atan2 for inf and nan, and alpha Tru64 5.1 doesn't follow + C99 for atan2(0., 0.). */ static double c_atan2(Py_complex z) { @@ -282,6 +283,14 @@ c_atan2(Py_complex z) /* atan2(+-inf, x) == +-pi/2 for finite x */ return copysign(0.5*Py_MATH_PI, z.imag); } + if (Py_IS_INFINITY(z.real) || z.imag == 0.) { + if (copysign(1., z.real) == 1.) + /* atan2(+-y, +inf) = atan2(+-0, +x) = +-0. */ + return copysign(0., z.imag); + else + /* atan2(+-y, -inf) = atan2(+-0., -x) = +-pi. */ + return copysign(Py_MATH_PI, z.imag); + } return atan2(z.imag, z.real); } -- cgit v1.2.1