From: Mark Dickinson <dickinsm@gmail.com>
Date: Sun, 17 May 2009 10:43:52 +0000 (+0000)
Subject: Merged revisions 72719 via svnmerge from
X-Git-Tag: 3.0~78
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=49fe64f349201a83195c0953b4a17e80b7f2f7ef;p=thirdparty%2FPython%2Fcpython.git

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 a0dcea0152fc..cb391be39620 100644
--- 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;
 }