[pypy-commit] pypy kill-multimethod: hg merge remove-remaining-smm

[Manuel Jacob]

Author: Manuel Jacob
Branch: kill-multimethod
Changeset: r69398:d30533ef4715
Date: 2014-02-25 05:31 +0100
http://bitbucket.org/pypy/pypy/changeset/d30533ef4715/

Log:	hg merge remove-remaining-smm

diff --git a/pypy/objspace/std/complexobject.py b/pypy/objspace/std/complexobject.py
--- a/pypy/objspace/std/complexobject.py
+++ b/pypy/objspace/std/complexobject.py
@@ -288,7 +288,7 @@
         if isinstance(w_obj, W_ComplexObject):
             return w_obj
         if space.isinstance_w(w_obj, space.w_int):
-            return W_ComplexObject(space.int_w(w_obj), 0.0)
+            return W_ComplexObject(float(space.int_w(w_obj)), 0.0)
         if space.isinstance_w(w_obj, space.w_long):
             return W_ComplexObject(space.float_w(w_obj), 0.0)
         if space.isinstance_w(w_obj, space.w_float):
diff --git a/pypy/objspace/std/floatobject.py b/pypy/objspace/std/floatobject.py
--- a/pypy/objspace/std/floatobject.py
+++ b/pypy/objspace/std/floatobject.py
@@ -366,7 +366,7 @@
         if isinstance(w_obj, W_FloatObject):
             return w_obj
         if space.isinstance_w(w_obj, space.w_int):
-            return W_FloatObject(space.int_w(w_obj))
+            return W_FloatObject(float(space.int_w(w_obj)))
         if space.isinstance_w(w_obj, space.w_long):
             return W_FloatObject(space.float_w(w_obj))