[Python-checkins] r72722 - in python/branches/release26-maint: Objects/complexobject.c
mark.dickinson
python-checkins at python.org
Sun May 17 12:44:48 CEST 2009
Author: mark.dickinson
Date: Sun May 17 12:44:48 2009
New Revision: 72722
Log:
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.
........
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/Objects/complexobject.c
Modified: python/branches/release26-maint/Objects/complexobject.c
==============================================================================
--- python/branches/release26-maint/Objects/complexobject.c (original)
+++ python/branches/release26-maint/Objects/complexobject.c Sun May 17 12:44:48 2009
@@ -785,7 +785,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;
}
@@ -793,7 +793,7 @@
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 @@
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;
}
More information about the Python-checkins
mailing list