Merged revisions 72718 via svnmerge from

mdickinson · mdickinson · commit 578cc749ab11 · 2009-05-17T10:40:10.000Z
svn+ssh://pythondev@svn.python.org/python/trunk ........ r72718 | mark.dickinson | 2009-05-17 11:38:30 +0100 (Sun, 17 May 2009) | 4 lines Issue #6044: remove confusing wording from complex -> integer and complex -> float conversion error messages. ........
diff --git a/Objects/complexobject.c b/Objects/complexobject.c
@@ -648,15 +648,15 @@ static PyObject *
 complex_int(PyObject *v)
 {
 	PyErr_SetString(PyExc_TypeError,
-		   "can't convert complex to int; use int(abs(z))");
+		   "can't convert complex to int");
 	return NULL;
 }
 
 static PyObject *
 complex_float(PyObject *v)
 {
 	PyErr_SetString(PyExc_TypeError,
-		   "can't convert complex to float; use abs(z)");
+		   "can't convert complex to float");
 	return NULL;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -648,15 +648,15 @@ static PyObject *`
`648`	`648`	`complex_int(PyObject *v)`
`649`	`649`	`{`
`650`	`650`	`PyErr_SetString(PyExc_TypeError,`
`651`		`- "can't convert complex to int; use int(abs(z))");`
	`651`	`+ "can't convert complex to int");`
`652`	`652`	`return NULL;`
`653`	`653`	`}`
`654`	`654`
`655`	`655`	`static PyObject *`
`656`	`656`	`complex_float(PyObject *v)`
`657`	`657`	`{`
`658`	`658`	`PyErr_SetString(PyExc_TypeError,`
`659`		`- "can't convert complex to float; use abs(z)");`
	`659`	`+ "can't convert complex to float");`
`660`	`660`	`return NULL;`
`661`	`661`	`}`
`662`	`662`