[Python-checkins] r72720 - in python/branches/release30-maint: Objects/complexobject.c

Sun May 17 12:43:52 CEST 2009

Author: mark.dickinson
Date: Sun May 17 12:43:52 2009
New Revision: 72720
Log:
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 (2009年5月17日) | 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 (2009年5月17日) | 4 lines
 
 Issue #6044: remove confusing wording from complex -> integer and
 complex -> float conversion error messages.
 ........
................
Modified:
 python/branches/release30-maint/ (props changed)
 python/branches/release30-maint/Objects/complexobject.c
Modified: python/branches/release30-maint/Objects/complexobject.c
==============================================================================

--- python/branches/release30-maint/Objects/complexobject.c	(original)
+++ python/branches/release30-maint/Objects/complexobject.c	Sun May 17 12:43:52 2009
@@ -656,7 +656,7 @@
 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 @@
 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;
 }
 
