changeset:   92942:cd4ecaf38283
branch:      2.7
parent:      92937:05274a517b37
user:        Antoine Pitrou <solipsis@pitrou.net>
date:        Fri Oct 10 23:49:32 2014 +0200
files:       Lib/test/test_complex.py Misc/NEWS Objects/complexobject.c
description:
Issue #22604: Fix assertion error in debug mode when dividing a complex number by (nan+0j).


diff -r 05274a517b37 -r cd4ecaf38283 Lib/test/test_complex.py
--- a/Lib/test/test_complex.py	Fri Oct 10 16:03:14 2014 -0500
+++ b/Lib/test/test_complex.py	Fri Oct 10 23:49:32 2014 +0200
@@ -26,7 +26,7 @@
                 unittest.TestCase.assertAlmostEqual(self, a, b)
 
     def assertCloseAbs(self, x, y, eps=1e-9):
-        """Return true iff floats x and y "are close\""""
+        """Return true iff floats x and y "are close"."""
         # put the one with larger magnitude second
         if abs(x) > abs(y):
             x, y = y, x
@@ -61,7 +61,7 @@
         self.fail(msg.format(x, y))
 
     def assertClose(self, x, y, eps=1e-9):
-        """Return true iff complexes x and y "are close\""""
+        """Return true iff complexes x and y "are close"."""
         self.assertCloseAbs(x.real, y.real, eps)
         self.assertCloseAbs(x.imag, y.imag, eps)
 
@@ -108,6 +108,11 @@
         self.assertAlmostEqual(complex.__truediv__(2+0j, 1+1j), 1-1j)
         self.assertRaises(ZeroDivisionError, complex.__truediv__, 1+1j, 0+0j)
 
+        for denom_real, denom_imag in [(0, NAN), (NAN, 0), (NAN, NAN)]:
+            z = complex(0, 0) / complex(denom_real, denom_imag)
+            self.assertTrue(isnan(z.real))
+            self.assertTrue(isnan(z.imag))
+
     def test_floordiv(self):
         self.assertAlmostEqual(complex.__floordiv__(3+0j, 1.5+0j), 2)
         self.assertRaises(ZeroDivisionError, complex.__floordiv__, 3+0j, 0+0j)
diff -r 05274a517b37 -r cd4ecaf38283 Misc/NEWS
--- a/Misc/NEWS	Fri Oct 10 16:03:14 2014 -0500
+++ b/Misc/NEWS	Fri Oct 10 23:49:32 2014 +0200
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #22604: Fix assertion error in debug mode when dividing a complex
+  number by (nan+0j).
+
 - Issue #22470: Fixed integer overflow issues in "backslashreplace" and
   "xmlcharrefreplace" error handlers.
 
diff -r 05274a517b37 -r cd4ecaf38283 Objects/complexobject.c
--- a/Objects/complexobject.c	Fri Oct 10 16:03:14 2014 -0500
+++ b/Objects/complexobject.c	Fri Oct 10 23:49:32 2014 +0200
@@ -96,7 +96,7 @@
      const double abs_breal = b.real < 0 ? -b.real : b.real;
      const double abs_bimag = b.imag < 0 ? -b.imag : b.imag;
 
-     if (abs_breal >= abs_bimag) {
+    if (abs_breal >= abs_bimag) {
         /* divide tops and bottom by b.real */
         if (abs_breal == 0.0) {
             errno = EDOM;
@@ -109,7 +109,7 @@
             r.imag = (a.imag - a.real * ratio) / denom;
         }
     }
-    else {
+    else if (abs_bimag >= abs_breal) {
         /* divide tops and bottom by b.imag */
         const double ratio = b.real / b.imag;
         const double denom = b.real * ratio + b.imag;
@@ -117,6 +117,10 @@
         r.real = (a.real * ratio + a.imag) / denom;
         r.imag = (a.imag * ratio - a.real) / denom;
     }
+    else {
+        /* At least one of b.real or b.imag is a NaN */
+        r.real = r.imag = Py_NAN;
+    }
     return r;
 }