[Python-checkins] r78320 - in python/branches/py3k: Objects/complexobject.c Objects/floatobject.c

[ezio.melotti]

Author: ezio.melotti
Date: Mon Feb 22 17:34:50 2010
New Revision: 78320

Log:
Merged revisions 78319 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78319 | ezio.melotti | 2010-02-22 18:30:58 +0200 (Mon, 22 Feb 2010) | 1 line
  
  #7482: clarify error message in case of division by zero of float and complex numbers.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Objects/complexobject.c
   python/branches/py3k/Objects/floatobject.c

Modified: python/branches/py3k/Objects/complexobject.c
==============================================================================
--- python/branches/py3k/Objects/complexobject.c	(original)
+++ python/branches/py3k/Objects/complexobject.c	Mon Feb 22 17:34:50 2010
@@ -504,7 +504,7 @@
 	quot = c_quot(a, b);
 	PyFPE_END_PROTECT(quot)
 	if (errno == EDOM) {
-		PyErr_SetString(PyExc_ZeroDivisionError, "complex division");
+		PyErr_SetString(PyExc_ZeroDivisionError, "complex division by zero");
 		return NULL;
 	}
 	return PyComplex_FromCComplex(quot);

Modified: python/branches/py3k/Objects/floatobject.c
==============================================================================
--- python/branches/py3k/Objects/floatobject.c	(original)
+++ python/branches/py3k/Objects/floatobject.c	Mon Feb 22 17:34:50 2010
@@ -570,7 +570,7 @@
 #ifdef Py_NAN
 	if (b == 0.0) {
 		PyErr_SetString(PyExc_ZeroDivisionError,
-				"float division");
+				"float division by zero");
 		return NULL;
 	}
 #endif