Author: Wim Lavrijsen <wlavrij...@lbl.gov>
Branch: reflex-support
Changeset: r66945:f04a6bd8cb77
Date: 2013-09-13 18:46 -0700
http://bitbucket.org/pypy/pypy/changeset/f04a6bd8cb77/
Log: fix rtyper issues
diff --git a/pypy/module/cppyy/capi/cint_capi.py
b/pypy/module/cppyy/capi/cint_capi.py
--- a/pypy/module/cppyy/capi/cint_capi.py
+++ b/pypy/module/cppyy/capi/cint_capi.py
@@ -139,7 +139,7 @@
fid = _tfn_install(funcname, npar)
tfn_pyfuncs[fid] = pyfunc
- newargs_w = (args_w[1], space.wrap(fid), args_w[3], args_w[4],
space.wrap(npar))
+ newargs_w = [args_w[1], space.wrap(fid), args_w[3], args_w[4],
space.wrap(npar)]
except (OperationError, TypeError, IndexError):
newargs_w = args_w[1:] # drop class
pass
@@ -408,6 +408,7 @@
@cpython_api([rffi.LONG, rffi.INT, rffi.DOUBLEP, rffi.DOUBLEP], rffi.DOUBLE,
error=CANNOT_FAIL)
def cppyy_tfn_callback(space, idx, npar, a0, a1):
pyfunc = tfn_pyfuncs[idx]
+ npar = int(npar)
from pypy.module._rawffi.interp_rawffi import unpack_simple_shape
from pypy.module._rawffi.array import W_Array, W_ArrayInstance
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
