[pypy-commit] pypy kill-multimethod: (pjenvey) Use space.isinstance_w instead of isinstance here to fix array ztranslation.

[Manuel Jacob]

Author: Manuel Jacob
Branch: kill-multimethod
Changeset: r69490:211aa0409896
Date: 2014-02-27 03:35 +0100
http://bitbucket.org/pypy/pypy/changeset/211aa0409896/

Log:    (pjenvey) Use space.isinstance_w instead of isinstance here to fix
        array ztranslation.

diff --git a/pypy/module/array/interp_array.py 
b/pypy/module/array/interp_array.py
--- a/pypy/module/array/interp_array.py
+++ b/pypy/module/array/interp_array.py
@@ -16,7 +16,6 @@
 from pypy.interpreter.typedef import (
     GetSetProperty, TypeDef, make_weakref_descr)
 from pypy.module._file.interp_file import W_File
-from pypy.objspace.std.floatobject import W_FloatObject
 
 
 @unwrap_spec(typecode=str)
@@ -626,7 +625,7 @@
             try:
                 item = unwrap(w_item)
             except OperationError, e:
-                if isinstance(w_item, W_FloatObject):
+                if space.isinstance_w(w_item, space.w_float):
                     # Odd special case from cpython
                     raise
                 if mytype.method != '' and e.match(space, space.w_TypeError):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit