Merged revisions 72718 via svnmerge from

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
index 8ce61b747eaf68d9b91f831ba363e38418e0fef1..a2334c9e835ded9e0cb0ad97fa6d26130b7a33f6 100644 (file)
--- a/Objects/complexobject.c
+++ b/Objects/complexobject.c
@@ -785,7 +785,7 @@ 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;
 }
 
@@ -793,7 +793,7 @@ static PyObject *
 complex_long(PyObject *v)
 {
        PyErr_SetString(PyExc_TypeError,
-                  "can't convert complex to long; use long(abs(z))");
+                  "can't convert complex to long");
        return NULL;
 }
 
@@ -801,7 +801,7 @@ 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;
 }