From: Mark Dickinson <dickinsm@gmail.com>
Date: Wed, 20 May 2009 18:41:04 +0000 (+0000)
Subject: Issue #5829: complex('1e500') shouldn't raise OverflowError
X-Git-Tag: v3.1rc1~95
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6b1e43b7bcbb85bd042d824e957971392d62beb7;p=python

Issue #5829: complex('1e500') shouldn't raise OverflowError
---

diff --git a/Lib/test/test_complex.py b/Lib/test/test_complex.py
index 43282d684b..f621186504 100644
--- a/Lib/test/test_complex.py
+++ b/Lib/test/test_complex.py
@@ -407,6 +407,13 @@ class ComplexTest(unittest.TestCase):
             self.assertEquals(atan2(z1.imag, -1.), atan2(0., -1.))
             self.assertEquals(atan2(z2.imag, -1.), atan2(-0., -1.))
 
+    @unittest.skipUnless(float.__getformat__("double").startswith("IEEE"),
+                         "test requires IEEE 754 doubles")
+    def test_overflow(self):
+        self.assertEqual(complex("1e500"), complex(INF, 0.0))
+        self.assertEqual(complex("-1e500j"), complex(0.0, -INF))
+        self.assertEqual(complex("-1e500+1.8e308j"), complex(-INF, INF))
+
     @unittest.skipUnless(float.__getformat__("double").startswith("IEEE"),
                          "test requires IEEE 754 doubles")
     def test_repr_roundtrip(self):
diff --git a/Misc/NEWS b/Misc/NEWS
index 7ecbd3f915..ea5d09025f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,10 @@ What's New in Python 3.1 release candidate 1?
 Core and Builtins
 -----------------
 
+- Issue #5829: complex("1e500") no longer raises OverflowError.  This
+  makes it consistent with float("1e500") and interpretation of real
+  and imaginary literals.
+
 - Issue #3527: Removed Py_WIN_WIDE_FILENAMES which is not used any more.
 
 - Issue #5994: the marshal module now has docstrings.
diff --git a/Objects/complexobject.c b/Objects/complexobject.c
index b904cc47c1..30d8b5216e 100644
--- a/Objects/complexobject.c
+++ b/Objects/complexobject.c
@@ -799,7 +799,7 @@ complex_subtype_from_string(PyTypeObject *type, PyObject *v)
 	*/
 
 	/* first look for forms starting with <float> */
-	z = PyOS_string_to_double(s, &end, PyExc_OverflowError);
+	z = PyOS_string_to_double(s, &end, NULL);
 	if (z == -1.0 && PyErr_Occurred()) {
 		if (PyErr_ExceptionMatches(PyExc_ValueError))
 			PyErr_Clear();
@@ -812,7 +812,7 @@ complex_subtype_from_string(PyTypeObject *type, PyObject *v)
 		if (*s == '+' || *s == '-') {
 			/* <float><signed-float>j | <float><sign>j */
 			x = z;
-			y = PyOS_string_to_double(s, &end, PyExc_OverflowError);
+			y = PyOS_string_to_double(s, &end, NULL);
 			if (y == -1.0 && PyErr_Occurred()) {
 				if (PyErr_ExceptionMatches(PyExc_ValueError))
 					PyErr_Clear();