From: Mark Dickinson <dickinsm@gmail.com>
Date: Sun, 17 May 2009 10:44:48 +0000 (+0000)
Subject: Merged revisions 72718 via svnmerge from
X-Git-Tag: v2.6.3rc1~276
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df99f0489549ffc67435826858bd60dffabc5a18;p=python

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 8ce61b747e..a2334c9e83 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;
 }