diff options
author | Mark Dickinson <dickinsm@gmail.com> | 2009-05-17 10:44:48 (GMT) |
---|---|---|
committer | Mark Dickinson <dickinsm@gmail.com> | 2009-05-17 10:44:48 (GMT) |
commit | df99f0489549ffc67435826858bd60dffabc5a18 (patch) | |
tree | d89a99dd78343cf839c747b5c45bca6c1d7e94d4 /Objects | |
parent | 96f15392a88215c981382173def8ecb94bb39b00 (diff) | |
download | cpython-df99f0489549ffc67435826858bd60dffabc5a18.zip cpython-df99f0489549ffc67435826858bd60dffabc5a18.tar.gz cpython-df99f0489549ffc67435826858bd60dffabc5a18.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.
........
Diffstat (limited to 'Objects')
-rw-r--r-- | Objects/complexobject.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Objects/complexobject.c b/Objects/complexobject.c index 8ce61b7..a2334c9 100644 --- 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; } |