[pypy-commit] pypy faster-sum: fixed

justinpeel noreply at buildbot.pypy.org
Mon Aug 29 20:16:27 CEST 2011


Author: Justin Peel <notmuchtotell at gmail.com>
Branch: faster-sum
Changeset: r46900:beff4fcadc5c
Date: 2011-08-29 12:15 -0600
http://bitbucket.org/pypy/pypy/changeset/beff4fcadc5c/

Log:	fixed

diff --git a/pypy/module/__builtin__/functional.py b/pypy/module/__builtin__/functional.py
--- a/pypy/module/__builtin__/functional.py
+++ b/pypy/module/__builtin__/functional.py
@@ -366,12 +366,11 @@
                     raise
                 return space.wrap(result_f)
             if space.isinstance_w(w_item, space.w_float):
-                num_f = space.float_w(w_item)
-                result_f += space.w_float(w_item)
+                result_f += space.float_w(w_item)
                 continue
             if space.isinstance_w(w_item, space.w_int):
-                num_f = float(space.w_int(w_item))
-                result_f += space.w_float(w_item)
+                num_f = float(space.int_w(w_item))
+                result_f += num_f
                 continue
         w_last = space.wrap(result_f)
         w_last = space.add(w_last, w_item)


More information about the pypy-commit mailing list