summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2009-05-17 10:40:10 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2009-05-17 10:40:10 (GMT)
commit578cc749ab11b04fcf43125a0d70af55e3d50191 (patch)
treebfc2c5a585e00cd606e14239c7b7d15da164c319
parentb1fba6b209a8b36a8edc4acd91d2f0789b8eb2cb (diff)
downloadcpython-578cc749ab11b04fcf43125a0d70af55e3d50191.zip
cpython-578cc749ab11b04fcf43125a0d70af55e3d50191.tar.gz
cpython-578cc749ab11b04fcf43125a0d70af55e3d50191.tar.bz2
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. ........
-rw-r--r--Objects/complexobject.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Objects/complexobject.c b/Objects/complexobject.c
index 0d13edf..b904cc4 100644
--- a/Objects/complexobject.c
+++ b/Objects/complexobject.c
@@ -648,7 +648,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;
}
@@ -656,7 +656,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;
}