Mercurial > cpython-lru_cache-weakref
diff Python/bltinmodule.c @ 43658:7408e1ae98c4 legacy-trunk
Fixup error return and add support for intermixed ints and floats/
| author | Raymond Hettinger <python@rcn.com> |
|---|---|
| date | Wed, 24 Oct 2007 02:05:51 +0000 |
| parents | 08ee256a9bd1 |
| children | 35da915adedc |
line wrap: on
line diff
--- a/Python/bltinmodule.c Wed Oct 24 01:28:33 2007 +0000 +++ b/Python/bltinmodule.c Wed Oct 24 02:05:51 2007 +0000 @@ -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);