Author: Manuel Jacob
Branch: remove-remaining-smm
Changeset: r69395:a62416f087b4
Date: 2014-02-25 05:29 +0100
http://bitbucket.org/pypy/pypy/changeset/a62416f087b4/
Log: Fix.
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))
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
