[Python-checkins] r58624 - python/trunk/Python/bltinmodule.c

[raymond.hettinger]

Author: raymond.hettinger
Date: Wed Oct 24 04:05:51 2007
New Revision: 58624

Modified:
   python/trunk/Python/bltinmodule.c
Log:
Fixup error return and add support for intermixed ints and floats/

Modified: python/trunk/Python/bltinmodule.c
==============================================================================
--- python/trunk/Python/bltinmodule.c	(original)
+++ python/trunk/Python/bltinmodule.c	Wed Oct 24 04:05:51 2007
@@ -2120,7 +2120,13 @@
         		if (PyFloat_CheckExact(item)) {
 				PyFPE_START_PROTECT("add", return 0)
 				f_result += PyFloat_AS_DOUBLE(item);
-				PyFPE_END_PROTECT(a)
+				PyFPE_END_PROTECT(f_result)
+				continue;
+			}
+        		if (PyInt_CheckExact(item)) {
+				PyFPE_START_PROTECT("add", return 0)
+				f_result += (double)PyInt_AS_LONG(item);
+				PyFPE_END_PROTECT(f_result)
 				continue;
 			}
 			result = PyFloat_FromDouble(f_result);