Author: Philip Jenvey <[email protected]>
Branch: py3k
Changeset: r74190:1fa509538f86
Date: 2014-10-24 13:40 -0700
http://bitbucket.org/pypy/pypy/changeset/1fa509538f86/
Log: allow_conversion isn't necessary on base number types
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
@@ -264,7 +264,7 @@
if isinstance(w_obj, W_ComplexObject):
return w_obj
if space.isinstance_w(w_obj, space.w_int):
- w_float = space.float_w(w_obj, allow_conversion=False)
+ w_float = space.float_w(w_obj)
return W_ComplexObject(w_float, 0.0)
if space.isinstance_w(w_obj, space.w_float):
return W_ComplexObject(space.float_w(w_obj), 0.0)
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
@@ -389,7 +389,7 @@
if isinstance(w_obj, W_FloatObject):
return w_obj
if space.isinstance_w(w_obj, space.w_int):
- return W_FloatObject(space.float_w(w_obj, allow_conversion=False))
+ return W_FloatObject(space.float_w(w_obj))
#@staticmethod
# XXX: unwrap_spec index?
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
