Fixed complex.__getnewargs__() to not emit another complex object.

alexandre.vassalotti · alexandre.vassalotti · commit f3fa570826a9 · 2008-06-04T20:41:44.000Z
git-svn-id: http://svn.python.org/projects/python/trunk@63948 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Lib/test/test_complex.py b/Lib/test/test_complex.py
@@ -373,6 +373,14 @@ def test_file(self):
             except (OSError, IOError):
                 pass
 
+    def test_getnewargs(self):
+        self.assertEqual((1+2j).__getnewargs__(), (1.0, 2.0))
+        self.assertEqual((1-2j).__getnewargs__(), (1.0, -2.0))
+        self.assertEqual((2j).__getnewargs__(), (0.0, 2.0))
+        self.assertEqual((-0j).__getnewargs__(), (0.0, -0.0))
+        self.assertEqual(complex(0, INF).__getnewargs__(), (0.0, INF))
+        self.assertEqual(complex(INF, 0).__getnewargs__(), (INF, 0.0))
+
     if float.__getformat__("double").startswith("IEEE"):
         def test_plus_minus_0j(self):
             # test that -0j and 0j literals are not identified
diff --git a/Objects/complexobject.c b/Objects/complexobject.c
@@ -822,7 +822,8 @@ PyDoc_STRVAR(complex_conjugate_doc,
 static PyObject *
 complex_getnewargs(PyComplexObject *v)
 {
-	return Py_BuildValue("(D)", &v->cval);
+	Py_complex c = v->cval;
+	return Py_BuildValue("(dd)", c.real, c.imag);
 }
 
 #if 0

Original file line number	Diff line number	Diff line change
`@@ -822,7 +822,8 @@ PyDoc_STRVAR(complex_conjugate_doc,`
`822`	`822`	`static PyObject *`
`823`	`823`	`complex_getnewargs(PyComplexObject *v)`
`824`	`824`	`{`
`825`		`- return Py_BuildValue("(D)", &v->cval);`
	`825`	`+ Py_complex c = v->cval;`
	`826`	`+ return Py_BuildValue("(dd)", c.real, c.imag);`
`826`	`827`	`}`
`827`	`828`
`828`	`829`	`#if 0`