From: Raymond Hettinger <python@rcn.com>
Date: Wed, 24 Oct 2007 02:05:51 +0000 (+0000)
Subject: Fixup error return and add support for intermixed ints and floats/
X-Git-Tag: v2.6a1~1132
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a8daf5b56fc6c298c30536583a5b903f9a31fb3;p=python

Fixup error return and add support for intermixed ints and floats/
---

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index cc96cdf7a6..7d5de27101 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -2120,7 +2120,13 @@ builtin_sum(PyObject *self, PyObject *args)
         		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);