Merged revisions 72719 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r72719 | mark.dickinson | 2009-05-17 11:40:10 +0100 (Sun, 17 May 2009) | 10 lines

  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 a0dcea0152fc453d7e06d46dd8aafcda7227b04b..cb391be396206ec95716bdf53e91af71c987d24f 100644 (file)
--- a/Objects/complexobject.c
+++ b/Objects/complexobject.c
@@ -656,7 +656,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;
 }
 
@@ -664,7 +664,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;
 }