[Python-checkins] cpython (merge 3.2 -> default): Issue #15477: Merge fix from 3.2
mark.dickinson
python-checkins at python.org
Sat Aug 18 13:26:25 CEST 2012
http://hg.python.org/cpython/rev/336653319112
changeset: 78641:336653319112
parent: 78638:3fba718e46e5
parent: 78640:08418369da7b
user: Mark Dickinson <mdickinson at enthought.com>
date: Sat Aug 18 12:26:15 2012 +0100
summary:
Issue #15477: Merge fix from 3.2
files:
Lib/test/test_cmath.py | 4 ----
Misc/NEWS | 3 +++
Modules/_math.c | 23 +++++++++++++++++++++++
Modules/_math.h | 8 ++------
4 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/Lib/test/test_cmath.py b/Lib/test/test_cmath.py
--- a/Lib/test/test_cmath.py
+++ b/Lib/test/test_cmath.py
@@ -519,15 +519,11 @@
# of zero, then atan and atanh will also have difficulties with
# the sign of complex zeros.
@requires_IEEE_754
- @unittest.skipIf(sysconfig.get_config_var('LOG1P_DROPS_ZERO_SIGN'),
- "system log1p() function doesn't preserve the sign")
def testAtanSign(self):
for z in complex_zeros:
self.assertComplexIdentical(cmath.atan(z), z)
@requires_IEEE_754
- @unittest.skipIf(sysconfig.get_config_var('LOG1P_DROPS_ZERO_SIGN'),
- "system log1p() function doesn't preserve the sign")
def testAtanhSign(self):
for z in complex_zeros:
self.assertComplexIdentical(cmath.atanh(z), z)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -16,6 +16,9 @@
Library
-------
+- Issue #15477: In cmath and math modules, add workaround for platforms whose
+ system-supplied log1p function doesn't respect signs of zeros.
+
- Issue #15715: importlib.__import__() will silence an ImportError when the use
of fromlist leads to a failed import.
diff --git a/Modules/_math.c b/Modules/_math.c
--- a/Modules/_math.c
+++ b/Modules/_math.c
@@ -189,6 +189,27 @@
significant loss of precision that arises from direct evaluation when x is
small. */
+#ifdef HAVE_LOG1P
+
+double
+_Py_log1p(double x)
+{
+ /* Some platforms supply a log1p function but don't respect the sign of
+ zero: log1p(-0.0) gives 0.0 instead of the correct result of -0.0.
+
+ To save fiddling with configure tests and platform checks, we handle the
+ special case of zero input directly on all platforms.
+ */
+ if (x == 0.0) {
+ return x;
+ }
+ else {
+ return log1p(x);
+ }
+}
+
+#else
+
double
_Py_log1p(double x)
{
@@ -230,3 +251,5 @@
return log(1.+x);
}
}
+
+#endif /* ifdef HAVE_LOG1P */
diff --git a/Modules/_math.h b/Modules/_math.h
--- a/Modules/_math.h
+++ b/Modules/_math.h
@@ -36,10 +36,6 @@
#define m_expm1 _Py_expm1
#endif
-#ifdef HAVE_LOG1P
-#define m_log1p log1p
-#else
-/* if the system doesn't have log1p, use the substitute
- function defined in Modules/_math.c. */
+/* Use the substitute from _math.c on all platforms:
+ it includes workarounds for buggy handling of zeros. */
#define m_log1p _Py_log1p
-#endif
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list